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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/08 01:52:29

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

Log message:
        (diary-fancy-display): It doesn't make sense to check font-lock-mode
        (see comments; reverts 2008-04-02 change).  (Bug#2199)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15283&r2=1.15284
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.181&r2=1.182

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15283
retrieving revision 1.15284
diff -u -b -r1.15283 -r1.15284
--- ChangeLog   8 Feb 2009 00:47:15 -0000       1.15283
+++ ChangeLog   8 Feb 2009 01:52:26 -0000       1.15284
@@ -1,3 +1,11 @@
+2009-02-08  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * simple.el (toggle-word-wrap): New command.

Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- calendar/diary-lib.el       5 Jan 2009 03:20:38 -0000       1.181
+++ calendar/diary-lib.el       8 Feb 2009 01:52:29 -0000       1.182
@@ -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))