Mercurial > emacs
changeset 105178:d0f5b10b5fb4
(diary-fancy-display): Always run the hook.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 24 Sep 2009 03:26:51 +0000 |
| parents | f3f51ce338e8 |
| children | 8143cdf4806f |
| files | lisp/ChangeLog lisp/calendar/diary-lib.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 24 03:22:40 2009 +0000 +++ b/lisp/ChangeLog Thu Sep 24 03:26:51 2009 +0000 @@ -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
--- a/lisp/calendar/diary-lib.el Thu Sep 24 03:22:40 2009 +0000 +++ b/lisp/calendar/diary-lib.el Thu Sep 24 03:26:51 2009 +0000 @@ -1019,8 +1019,11 @@ (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"))))