From: Adam W Date: Thu, 24 Nov 2011 00:15:19 +0000 (+0000) Subject: mail-source.el (mail-source-fetch-maildir): Don't expect the return value of `delete... X-Git-Tag: emacs-pretest-24.0.92~64 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29291ef14b0592d235f4b62463a7eb4471e5a55f;p=emacs.git 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. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 3eeaad09529..9c05fab048e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2011-11-24 Adam W (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 Lars Magne Ingebrigtsen * shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 6e6ef76c0c1..2315cff6261 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/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)))