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

2157a2be · Glenn Morris · 6125167c · 2157a2be · 2157a2be
Commit 2157a2be authored Sep 24, 2009 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

lisp/ChangeLog lisp/ChangeLog +2 -0

lisp/calendar/diary-lib.el lisp/calendar/diary-lib.el +5 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
 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

--- 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"))))