# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1103641356 0
# Node ID a48a2a91a0634b3e3b163da83537d10aacc6ea7c
# Parent  a7985894de8112e541e5ec8ecfdc8dc9f794463a
*** empty log message ***

diff -r a7985894de81 -r a48a2a91a063 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 21 11:50:52 2004 +0000
+++ b/lisp/ChangeLog	Tue Dec 21 15:02:36 2004 +0000
@@ -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.