[Emacs-diffs] emacs/lisp ChangeLog calendar/diary-lib.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/24 03:26:54

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : diary-lib.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16250&r2=1.16251
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.190&r2=1.191

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16250
retrieving revision 1.16251
diff -u -b -r1.16250 -r1.16251
--- ChangeLog   24 Sep 2009 03:22:40 -0000      1.16250
+++ ChangeLog   24 Sep 2009 03:26:51 -0000      1.16251
@@ -1,5 +1,7 @@
 2009-09-24  Glenn Morris  <address@hidden>
 
+       * 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

Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- calendar/diary-lib.el       15 Sep 2009 02:34:54 -0000      1.190
+++ calendar/diary-lib.el       24 Sep 2009 03:26:54 -0000      1.191
@@ -1019,7 +1019,10 @@
                      (overlay-put
                       (make-overlay (match-beginning 0) (match-end 0))
                       'face temp-face)))))))
-      (or (eq major-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"))))