*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b210a675939decbef64ad05972dcc76bb9940fd4..78fc948a699eb981173936dabe862926896f611b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-21  Markus Rost  <rost@ias.edu>
+
+       * calendar/diary-lib.el (mark-diary-entries): Set
+       mark-diary-entries-in-calendar only after checking for diary-file.
+
 2004-12-21  Richard M. Stallman  <rms@gnu.org>
 
        * faces.el (escape-glyph): Use blue against light foreground.