gnus-art.el (gnus-article-setup-buffer): Stop the date timer if gnus-article-update-date-headers is nil.

gnus.texi (Article Date): Remove mention of gnus-stop-date-timer, since it's run automatically.

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a5c37092756..f3a404338e9 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-art.el (gnus-article-setup-buffer): Stop the date timer if
+        gnus-article-update-date-headers is nil.
+
 2011-02-01  Julien Danjou  <julien@danjou.info>
 
         * mm-uu.el (mm-uu-type-alist): Add support for git format-patch diff
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index af47daf970b..bddcaa9fd9d 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4505,9 +4505,13 @@ commands:
         (setq gnus-summary-buffer
               (gnus-summary-buffer-name gnus-newsgroup-name))
         (gnus-summary-set-local-parameters gnus-newsgroup-name)
-        (when (and gnus-article-update-date-headers
-                   (not article-lapsed-timer))
+        (cond
+         ((and gnus-article-update-date-headers
+               (not article-lapsed-timer))
           (gnus-start-date-timer gnus-article-update-date-headers))
+         ((and (not gnus-article-update-date-headers)
+               article-lapsed-timer)
+          (gnus-stop-date-timer)))
         (current-buffer)))))
 
 ;; Set article window start at LINE, where LINE is the number of lines