(article-update-date-lapsed): Skip past all the X-Sent/Date headers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9842acd..1cb82c1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
 
        * gnus-art.el (article-update-date-lapsed): Ensure that point stays at
        the "same place" even if point is on the line being replaced.
+       (article-update-date-lapsed): Allow updating both the combined lapsed
+       and the lapsed headers.
+       (article-update-date-lapsed): Skip past all the X-Sent/Date headers.
 
 2011-01-27  Julien Danjou  <julien@danjou.info>
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index c72c2fe..b7a751e 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3689,10 +3689,16 @@ function and want to see what the date was before converting."
                  ;; This will ensure that point stays at the "same
                  ;; place".
                  (when (or (< old-point (match-beginning 0))
-                           (> old-point (line-end-position)))
+                           (> old-point (progn
+                                          (forward-line 1)
+                                          (while (and (not (eobp))
+                                                      (looking-at "X-Sent:\\|Date:"))
+                                            (forward-line))
+                                          (point))))
                    (setq old-point nil))
-                 (if gnus-treat-date-combined-lapsed
-                     (article-date-combined-lapsed t)
+                 (when gnus-treat-date-combined-lapsed
+                   (article-date-combined-lapsed t))
+                 (when gnus-treat-date-lapsed
                    (article-date-lapsed t)))
                (goto-char (or old-point (marker-position mark)))
                (move-marker mark nil))))