[gnus git] branch master updated: n0-17-401-gf75a667 =1= 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.

       via  f75a667d4e5c2dc06fbaf84eb6e76efc262cdf7c (commit)
      from  f13fdda616d99eeb9dddc37be55ac7680db7dd6f (commit)


- Log -----------------------------------------------------------------
commit f75a667d4e5c2dc06fbaf84eb6e76efc262cdf7c
Author: Adam W <[email protected]>
Date:   Thu Nov 24 00:12:57 2011 +0000

    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/ChangeLog b/lisp/ChangeLog
index 488ede0..001d657 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-24  Adam W  <[email protected]>  (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  <[email protected]>
 
 	* 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
--- 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)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog      |    6 ++++++
 lisp/mail-source.el |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project