# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1109544852 0
# Node ID 70e25b87a334032b88599af9bc95f3d91e0020c9
# Parent  6f85d024a41d8815e335430d93baa1c99bbc51e6
*** empty log message ***

diff -r 6f85d024a41d -r 70e25b87a334 etc/NEWS
--- a/etc/NEWS	Sun Feb 27 22:46:03 2005 +0000
+++ b/etc/NEWS	Sun Feb 27 22:54:12 2005 +0000
@@ -1599,6 +1599,9 @@
 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 -r 6f85d024a41d -r 70e25b87a334 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Feb 27 22:46:03 2005 +0000
+++ b/lisp/ChangeLog	Sun Feb 27 22:54:12 2005 +0000
@@ -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.