*** empty log message ***

2 files changed, 14 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dea317099b..b1e928bae4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-24  Glenn Morris  <[email protected]>
+
+	* 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 <[email protected]>.
+
+	* 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  <[email protected]>
 
 	* dired.el (dired) <defgroup>: Add link to manual.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index f4150ee082..f79a217cc3 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -554,7 +554,6 @@ This function is provided for optional use as the `diary-display-hook'."
             (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 @@ This function is provided for optional use as the `diary-display-hook'."
       (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 ()