*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dea317099bd30ee59c4de56ded23816583f01980..b1e928bae46cd712b2e55481e6b1b7875c879555 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index f4150ee08254ec024fde7f5176a8b6443980b3d7..f79a217cc322e9f88621781743cab48b337cd9c3 100644 (file)
--- 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 ()