From 4af473c64ef3532e95daf8ca349e97da755daf1c Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 5 Sep 2010 00:42:42 +0200 Subject: [PATCH] Always move the crash box to the Incoming file. Fixes mistake in previous checkin. --- lisp/mail-source.el | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lisp/mail-source.el b/lisp/mail-source.el index a8db55b18..7a6268693 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -631,23 +631,23 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile) ;; Delete or move the incoming mail out of the way. (if (eq mail-source-delete-incoming t) (delete-file mail-source-crash-box) - ;; Don't check for old incoming files more than once per day to - ;; save a lot of file accesses. - (when (or (null mail-source-incoming-last-checked-time) - (> (time-to-seconds - (time-since mail-source-incoming-last-checked-time)) - (* 24 60 60))) - (setq mail-source-incoming-last-checked-time (current-time)) - (let ((incoming - (mm-make-temp-file - (expand-file-name - mail-source-incoming-file-prefix - mail-source-directory)))) - (unless (file-exists-p (file-name-directory incoming)) - (make-directory (file-name-directory incoming) t)) - (rename-file mail-source-crash-box incoming t) - ;; remove old incoming files? - (when (natnump mail-source-delete-incoming) + (let ((incoming + (mm-make-temp-file + (expand-file-name + mail-source-incoming-file-prefix + mail-source-directory)))) + (unless (file-exists-p (file-name-directory incoming)) + (make-directory (file-name-directory incoming) t)) + (rename-file mail-source-crash-box incoming t) + ;; remove old incoming files? + (when (natnump mail-source-delete-incoming) + ;; Don't check for old incoming files more than once per day to + ;; save a lot of file accesses. + (when (or (null mail-source-incoming-last-checked-time) + (> (time-to-seconds + (time-since mail-source-incoming-last-checked-time)) + (* 24 60 60))) + (setq mail-source-incoming-last-checked-time (current-time)) (mail-source-delete-old-incoming mail-source-delete-incoming mail-source-delete-old-incoming-confirm))))))) -- 2.34.1