From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 3 Feb 2011 05:01:44 +0000 (+0000)
Subject: gnus-art.el (gnus-article-setup-buffer): Stop the date timer if gnus-article-update... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1048^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f13c2e2d952ac66c992f6c1d5a8bc941939cd05;p=emacs.git

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.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index aa8af31b25a..32cbd6ca0d7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.texi (Article Date): Remove mention of gnus-stop-date-timer,
+	since it's run automatically.
+
 2011-02-01  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (Customizing Articles): Fix typo.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index fba33534ad9..3806cdd8e96 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9503,8 +9503,7 @@ that off, say:
 (setq gnus-article-update-date-headers nil)
 @end lisp
 
-in your @file{~/.gnus.el} file.  If you want to stop the updating
-dynamically, you can use the @code{gnus-stop-date-timer} command.
+in your @file{~/.gnus.el} file.
 
 @item W T o
 @kindex W T o (Summary)
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