# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1080153477 0
# Node ID a059a7176bbdbb5703666f2cc11667942bd55fdf
# Parent  934d92d8b4960bdae41aed11089cbb8dd6dee4c1
*** empty log message ***

diff -r 934d92d8b496 -r a059a7176bbd lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 24 18:37:08 2004 +0000
+++ b/lisp/ChangeLog	Wed Mar 24 18:37:57 2004 +0000
@@ -1,3 +1,16 @@
+2004-03-24  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+	* calendar/appt.el (appt-check): Remove superfluous progn.
+	When finished with diary buffer: if it was not being displayed
+	before, kill it; otherwise restore its original state.
+	Suggested by Matthew Mundell <matt@mundell.ukfsn.org>.
+
+	* calendar/calendar.el (calendar-set-mode-line): Use total
+	available mode-line width, rather than frame-width.
+
+	* calendar/diary-lib.el (fancy-diary-display): Set mode-line
+	after mode change so effect not lost.
+
 2004-03-23  Dave Love  <fx@gnu.org>
 
 	* dired.el (dired) <defgroup>: Add link to manual.
diff -r 934d92d8b496 -r a059a7176bbd lisp/calendar/diary-lib.el
--- a/lisp/calendar/diary-lib.el	Wed Mar 24 18:37:08 2004 +0000
+++ b/lisp/calendar/diary-lib.el	Wed Mar 24 18:37:57 2004 +0000
@@ -554,7 +554,6 @@
             (message "%s" msg)
           (set-buffer (get-buffer-create holiday-buffer))
           (setq buffer-read-only nil)
-          (calendar-set-mode-line date-string)
           (erase-buffer)
           (insert (mapconcat 'identity holiday-list "\n"))
           (goto-char (point-min))
@@ -658,6 +657,7 @@
       (setq buffer-read-only t)
       (display-buffer fancy-diary-buffer)
       (fancy-diary-display-mode)
+      (calendar-set-mode-line date-string)
       (message "Preparing diary...done"))))
 
 (defun make-fancy-diary-buffer ()