gnus-art.el (article-date-ut): Replace infinitely many Date headers with a single...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 34314ad847961c47d4db04b43713f3428e8751f8..f9bcd902cd97ffaad81b9e9bd9c931460ec98616 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,8 @@
        * gnus-art.el (article-transform-date): Rewrite to still work when
        there are several rfc2822 parts.
        (article-transform-date): Fix infinite recursion.
+       (article-date-ut): Replace infinitely many Date headers with a single
+       one when called interactively.
 
        * nnimap.el (nnimap-wait-for-response): Wait for results in a more
        secure manner.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index a0eb43eff61181936cf16a1fe286f90e1ae9c409..a76a71be6496639df602ac140101faf91b0203b7 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1018,6 +1018,8 @@ on parts -- for instance, adding Vcard info to a database."
   (let ((types '(ut local english lapsed combined-lapsed
                    iso8601 original user-defined))
        default)
+    ;; Try to respect the legacy `gnus-treat-date-*' variables, if
+    ;; they're set.
     (dolist (type types)
       (let ((variable (intern (format "gnus-treat-date-%s" type))))
        (when (and (boundp variable)
@@ -1028,6 +1030,7 @@ on parts -- for instance, adding Vcard info to a database."
               (memq 'lapsed default))
       (setq default (delq 'lapsed default)))
     (or default
+       ;; If they weren't set, we default to `combined-lapsed'.
        '(combined-lapsed)))
   "A list of Date header formats to display.
 Valid formats are `ut' (universal time), `local' (local time
@@ -3439,8 +3442,8 @@ possible values."
            (setq date (get-text-property (match-beginning 0) 'original-date))
            (delete-region (point-at-bol) (progn
                                            (gnus-article-forward-header)
-                                           (point)))
-           (article-transform-date date type bface eface)))))))
+                                           (point))))
+         (article-transform-date date type bface eface))))))
 
 (defun article-transform-date (date type bface eface)
   (dolist (this-type (cond