[gnus git] branch master updated: m0-7-218-g8a2bfb0 =1= mm-decode.el (mm-temp-files-delete): Fix file deletion logic

       via  8a2bfb0bcfbea15211b451ad6e472d8aa4c64603 (commit)
      from  f7b8d64fd643558163383c9432d625a706310e5f (commit)


- Log -----------------------------------------------------------------
commit 8a2bfb0bcfbea15211b451ad6e472d8aa4c64603
Author: Katsumi Yamaoka <[email protected]>
Date:   Wed Aug 28 08:37:58 2013 +0000

    mm-decode.el (mm-temp-files-delete): Fix file deletion logic

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab5882a..dfb4d54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-28  Katsumi Yamaoka  <[email protected]>
+
+	* mm-decode.el (mm-temp-files-delete): Fix file deletion logic.
+
 2013-08-19  Katsumi Yamaoka  <[email protected]>
 
 	* mm-util.el (mm-coding-system-priorities): Exclude iso-2022-jp-2 and
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index dbbf0be..28d930b 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -607,19 +607,19 @@ files left at the next time."
 		    (split-string (buffer-string) "\n" t))))
 	 fails)
     (dolist (temp (append cache mm-temp-files-to-be-deleted))
-      (unless (and (file-exists-p temp)
+      (when (and (file-exists-p temp)
 		   (if (file-directory-p temp)
 		       ;; A parent directory left at the previous time.
 		       (progn
 			 (ignore-errors (delete-directory temp))
-			 (not (file-exists-p temp)))
+		       (file-exists-p temp))
 		     ;; Delete a temporary file and its parent directory.
 		     (ignore-errors (delete-file temp))
-		     (and (not (file-exists-p temp))
+		   (or (file-exists-p temp)
 			  (progn
 			    (setq temp (file-name-directory temp))
 			    (ignore-errors (delete-directory temp))
-			    (not (file-exists-p temp))))))
+			 (file-exists-p temp)))))
 	(push temp fails)))
     (if fails
 	;; Schedule the deletion of the files left at the next time.

-----------------------------------------------------------------------
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    |    4 ++++
 lisp/mm-decode.el |   22 +++++++++++-----------
 2 files changed, 15 insertions(+), 11 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