mail-source.el (mail-source-fetch-maildir): Don't expect the return value of `delete...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 488ede0..001d657 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-24  Adam W  <adam_w67@yahoo.com>  (tiny change)
+
+       * mail-source.el (mail-source-fetch-maildir): Don't expect the return
+       value of `delete-file', that returns nil for a local file but returns t
+       for a remote file using ssh.
+
 2011-11-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        * gnus-sum.el (gnus-summary-save-article): Spelling fix.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 6e6ef76..2315cff 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -1017,6 +1017,7 @@ This only works when `display-time' is enabled."
          (dolist (file (directory-files (concat path subdir) t))
            (when (and (not (file-directory-p file))
                       (not (if function
+                               ;; `function' should return nil if successful.
                                (funcall function file mail-source-crash-box)
                              (let ((coding-system-for-write
                                     mm-text-coding-system)
@@ -1035,7 +1036,8 @@ This only works when `display-time' is enabled."
 ;;;                              (insert "\n\n")
                                  ;; MMDF mail format
                                  (insert "\001\001\001\001\n"))
-                               (delete-file file)))))
+                               (delete-file file)
+                               nil))))
              (incf found (mail-source-callback callback file))
              (mail-source-delete-crash-box)))))
       found)))