(diary-fancy-display): It doesn't make sense to check font-lock-mode

(see comments; reverts 2008-04-02 change).  (Bug#2199)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 371a97bcab369834ea80d504ca93f41b003a0071..2a8914bb471da0bc720205220d73abfb63603898 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-08  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <juri@jurta.org>
 
        * simple.el (toggle-word-wrap): New command.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index ac80a60ae355fd35f2e53f0da00890c3a856b05d..57f18f69137ac557108580df28ae747267de186d 100644 (file)
--- 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))