From c253eff0aef4b4340302090d9057ce45710d6a43 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 8 Feb 2009 01:52:26 +0000 Subject: [PATCH] (diary-fancy-display): It doesn't make sense to check font-lock-mode (see comments; reverts 2008-04-02 change). (Bug#2199) --- lisp/ChangeLog | 8 ++++++++ lisp/calendar/diary-lib.el | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 371a97bcab3..2a8914bb471 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2009-02-08 Glenn Morris + + * calendar/calendar.el (diary-entry-marker, calendar-today-marker) + (calendar-holiday-marker, calendar-mark-visible-date): + * calendar/diary-lib.el (diary-fancy-display): + It doesn't make sense to check font-lock-mode (see comments; + reverts 2008-04-02 change). (Bug#2199) + 2009-02-08 Juri Linkov * simple.el (toggle-word-wrap): New command. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index ac80a60ae35..57f18f69137 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1017,7 +1017,9 @@ This is an option for `diary-display-function'." (nth 1 entry))) :type 'diary-entry) (insert this-entry ?\n)) - (and font-lock-mode + ;; Doesn't make sense to check font-lock-mode - see + ;; comments above diary-entry-marker in calendar.el. + (and ; font-lock-mode (setq marks (nth 4 entry)) (save-excursion (setq temp-face (calendar-make-temp-face marks)) -- 2.11.4.GIT