From: Glenn Morris <rgm@gnu.org>
Date: Sun, 27 Feb 2005 22:54:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~2079
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f43ae016822a121eee313180bc4788154f897b42;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index 3ca9d1e0da5..f1d17ef58bf 100644
--- 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 1e195944963..716f6e5a42f 100644
--- 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.