*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 3ca9d1e0da5ee670dc06fdd2907b15d59b113fb4..f1d17ef58bfbff7f0f95910974d6164d5d1b3125 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1599,6 +1599,9 @@ count backward from the end of the year.
 prompts for a year and a week number, and moves to the first
 day of that ISO week.
 
+** The new variable `calendar-minimum-window-height' affects the
+window generated by the function `generate-calendar-window'.
+
 ---
 ** The functions `holiday-easter-etc' and `holiday-advent' now take
 optional arguments, in order to only report on the specified holiday

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e19594496342ef1a621d53307309ce5fb9e7776..716f6e5a42fb0b7747c2e0d25eeaaabb7541f81c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-27  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+       * calendar/diary-lib.el (diary-remind): Discard any mark portion
+       from diary-entry.  Reported by Andrew Kemp <ajwk@pell.uklinux.net>.
+
 2005-02-27  Luc Teirlinck  <teirllm@auburn.edu>
 
        * cus-edit.el: Comment change.