diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mail-source.el | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 48571096cc7..79d38f1bfe3 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -10294,7 +10294,6 @@ latter case, they will be copied into the relevant groups." "Import an arbitrary file into a mail newsgroup." (interactive "fImport file: \nP") (let ((group gnus-newsgroup-name) - (now (current-time)) atts lines group-art) (unless (gnus-check-backend-function 'request-accept-article group) (error "%s does not support article importing" group)) @@ -10313,6 +10312,7 @@ latter case, they will be copied into the relevant groups." (goto-char (point-min)) (unless (re-search-forward "^date:" nil t) (goto-char (point-max)) + (setq atts (file-attributes file)) (insert "Date: " (message-make-date (nth 5 atts)) "\n"))) ;; This doesn't look like an article, so we fudge some headers. (setq atts (file-attributes file) diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 3befd46620e..93f03be72d0 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -591,25 +591,21 @@ Return the number of files that were found." If CONFIRM is non-nil, ask for confirmation before removing a file." (interactive "P") (require 'gnus-util) - (let* ((high2days (/ 65536.0 60 60 24));; convert high bits to days - (low2days (/ 1.0 65536.0)) ;; convert low bits to days + (let* ((now (current-time)) (diff (if (natnump age) age 30));; fallback, if no valid AGE given - currday files) + files) (setq files (directory-files mail-source-directory t (concat "\\`" - (regexp-quote mail-source-incoming-file-prefix))) - currday (* (car (current-time)) high2days) - currday (+ currday (* low2days (nth 1 (current-time))))) + (regexp-quote mail-source-incoming-file-prefix)))) (while files (let* ((ffile (car files)) (bfile (replace-regexp-in-string "\\`.*/\\([^/]+\\)\\'" "\\1" ffile)) - (filetime (nth 5 (file-attributes ffile))) - (fileday (* (car filetime) high2days)) - (fileday (+ fileday (* low2days (nth 1 filetime))))) + (filetime (nth 5 (file-attributes ffile)))) (setq files (cdr files)) - (when (and (> (- currday fileday) diff) + (when (and (> (time-to-number-of-days (time-subtract now filetime)) + diff) (if confirm (y-or-n-p (format-message "\ |