(unrmail): In the absence of Mail-from, prefer Date over current-time.

(Bug#2175)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81c7b01638358d36c67bb2cba3ddf2325d0451fd..ca787cfcd2ddde9b7ca8adeeafb6b03914e031e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-03  Glenn Morris  <rgm@gnu.org>
 
+       * mail/unrmail.el (unrmail): In the absence of Mail-from, prefer Date
+       over current-time.  (Bug#2175)
+
        * mail/rmail.el (rmail-convert-babyl-to-mbox): Disable undo while
        inserting the converted mailbox.
        (rmail-get-new-mail): Restore the loop over inboxes when two or more

diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 9d1717368bd6f45d2f45004f7967cda791bc754d..8fb15f1813c31003d9a9e7483e1a12b99e096b1d 100644 (file)
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -184,11 +184,21 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
              (setq mail-from
                    (or (mail-fetch-field "Mail-From")
                        (concat "From "
-                               (mail-strip-quoted-names (or (mail-fetch-field "from")
-                                                            (mail-fetch-field "really-from")
-                                                            (mail-fetch-field "sender")
-                                                            "unknown"))
-                               " " (current-time-string))))
+                               (mail-strip-quoted-names
+                                (or (mail-fetch-field "from")
+                                    (mail-fetch-field "really-from")
+                                    (mail-fetch-field "sender")
+                                    "unknown"))
+                               "  "
+                               (let ((date (mail-fetch-field "date")))
+                                 (or
+                                  (and date
+                                       (setq date
+                                             (ignore-errors
+                                              (format-time-string
+                                               "%a %b %e %T %Y"
+                                               (date-to-time date)))))
+                                  (current-time-string))))))
 
              ;; If the message specifies a coding system, use it.
              (let ((maybe-coding (mail-fetch-field "X-Coding-System")))