# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1234057946 0
# Node ID f0a6af6c77e8d62a10363a842bbf422f666983b8
# Parent  6c501f7469ab97fdce93feca04f832d19df8e357
(diary-fancy-display): It doesn't make sense to check font-lock-mode
(see comments; reverts 2008-04-02 change).  (Bug#2199)

diff -r 6c501f7469ab -r f0a6af6c77e8 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 08 01:52:01 2009 +0000
+++ b/lisp/ChangeLog	Sun Feb 08 01:52:26 2009 +0000
@@ -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 -r 6c501f7469ab -r f0a6af6c77e8 lisp/calendar/diary-lib.el
--- a/lisp/calendar/diary-lib.el	Sun Feb 08 01:52:01 2009 +0000
+++ b/lisp/calendar/diary-lib.el	Sun Feb 08 01:52:26 2009 +0000
@@ -1017,7 +1017,9 @@
                                                     (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))