(gnus-display-time-event-handler):

Check display-time-timer at runtime rather than only at load time
in case display-time-mode is turned off in the mean time.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b997b86b0c85399c1bb2b44c28e4f51d978faa17..d581274b80369c5c4c6871c4c61e6a1bd5b6088b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-start.el (gnus-display-time-event-handler):
+       Check display-time-timer at runtime rather than only at load time
+       in case display-time-mode is turned off in the mean time.
+
 2005-03-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnimap.el (nnimap-open-connection): Print which authinfo file is
@@ -11,8 +17,8 @@
 
 2005-03-15  Reiner Steib  <Reiner.Steib@gmx.de>
 
-       * nnmaildir.el (nnmaildir-request-accept-article): Use
-       `nnheader-cancel-timer' for compatibility with current XEmacs.
+       * nnmaildir.el (nnmaildir-request-accept-article):
+       Use `nnheader-cancel-timer' for compatibility with current XEmacs.
 
 2005-03-13  Steve Youngs  <steve@sxemacs.org>
 
@@ -26,12 +32,12 @@
        for `with-timeout'.
 
        * mail-source.el: Require timer-funcs at compile time when in
-       XEmacs for `run-with-idle-timer'.  
+       XEmacs for `run-with-idle-timer'.
 
        * gnus-async.el: Ditto.
 
        * dgnushack.el: No need to ignore `run-with-idle-timer', XEmacs
-       has this function now. 
+       has this function now.
 
 2005-03-16  Lute Kamstra  <lute@gnu.org>
 
@@ -43,8 +49,7 @@
 
 2005-03-10  Arne J\e,Ax\e(Brgensen <arne@arnested.dk>  (tiny change)
 
-       * nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one
-       flaw.
+       * nnimap.el (nnimap-retrieve-headers-from-server): Fix off-by-one flaw.
 
 2005-03-08  Bjorn Solberg <bjorn_ding@hekneby.org>  (tiny change)
 

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index f01134165134e5a69e590f0c1080702bc2e17274..6eec4f4e846f795d5e23a8de31ed639a8e76df3d 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1,5 +1,5 @@
 ;;; gnus-start.el --- startup functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -3083,12 +3083,10 @@ If this variable is nil, don't do anything."
            (file-name-as-directory (expand-file-name gnus-default-directory))
          default-directory)))
 
-(eval-and-compile
-(defalias 'gnus-display-time-event-handler
-  (if (gnus-boundp 'display-time-timer)
-      'display-time-event-handler
-    (lambda () "Does nothing as `display-time-timer' is not bound.
-Would otherwise be an alias for `display-time-event-handler'." nil))))
+(defun gnus-display-time-event-handler ()
+  (if (and (fboundp 'display-time-event-handler)
+          (gnus-boundp 'display-time-timer))
+      (display-time-event-handler)))
 
 ;;;###autoload
 (defun gnus-fixup-nnimap-unread-after-getting-new-news ()
@@ -3107,7 +3105,7 @@ Would otherwise be an alias for `display-time-event-handler'." nil))))
 
 (provide 'gnus-start)
 
-;;; arch-tag: f4584a22-b7b7-4853-abfc-a637329af5d2
+;; arch-tag: f4584a22-b7b7-4853-abfc-a637329af5d2
 ;;; gnus-start.el ends here