From: Glenn Morris <rgm@gnu.org>
Date: Tue, 21 Dec 2004 15:02:36 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~3180
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a74deabc2bac6281a28be8b871d173a1fc6e3f5a;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b210a675939..78fc948a699 100644
--- 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.