[Emacs-diffs] /srv/bzr/emacs/trunk r106498: 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.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106498
author: Adam W <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-11-24 00:15:19 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mail-source.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-11-23 00:20:17 +0000
+++ b/lisp/gnus/ChangeLog       2011-11-24 00:15:19 +0000
@@ -1,3 +1,9 @@
+2011-11-24  Adam W  <address@hidden>  (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  <address@hidden>
 
        * shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to

=== modified file 'lisp/gnus/mail-source.el'
--- a/lisp/gnus/mail-source.el  2011-02-13 00:25:29 +0000
+++ b/lisp/gnus/mail-source.el  2011-11-24 00:15:19 +0000
@@ -1017,6 +1017,7 @@
          (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 @@
 ;;;                              (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)))