(diary-fancy-display): Always run the hook.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a15075cc2fafb39b6fba4371c175a798ba98df7..85b25205697b445abe077f68f7e1c8c202c86401 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-09-24  Glenn Morris  <rgm@gnu.org>
 
+       * calendar/diary-lib.el (diary-fancy-display): Always run the hook.
+
        * term/ns-win.el (ns-reg-to-script): Define for compiler.
 
        * mail/rmailmm.el (rmail-mime-multipart-handler): Accept the case where

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 6f73c1048ddb2374af6cdb5579aaf5cb6f047420..9ed28c403a9dd2458b6896921db8ce6798faa1d7 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1019,8 +1019,11 @@ This is an option for `diary-display-function'."
                      (overlay-put
                       (make-overlay (match-beginning 0) (match-end 0))
                       'face temp-face)))))))
-      (or (eq major-mode 'diary-fancy-display-mode)
-          (diary-fancy-display-mode))
+      ;; FIXME can't remember what this check was for.
+      ;; To prevent something looping, or a minor optimization?
+      (if (eq major-mode 'diary-fancy-display-mode)
+          (run-hooks 'diary-fancy-display-mode-hook)
+        (diary-fancy-display-mode))
       (calendar-set-mode-line date-string)
       (message "Preparing diary...done"))))