(simple-diary-display): Reset modeline even if

there are no diary entries since the diary buffer may be displayed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d745877a0c7724053bb7deb32b30274c7143bb2e..48727b52341a5233962db720467553a599a55131 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+1999-11-03  Edward M. Reingold  <reingold@emr.cs.uiuc.edu>
+
+       * calendar.el (redraw-calendar): Move to nearest date before
+       redrawing.
+
+       * diary-lib.el (simple-diary-display): Reset modeline even if
+       there are no diary entries since the diary buffer may be displayed.
+
 1999-11-03  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
        * emacs-lisp/debug.el (debug): If noninteractive, display the

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index c35dcd248240551c118440fb0af9ecf375c9ac51..e45a81aa86819560d9f7b520f95f5813e868b176 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -392,6 +392,10 @@ changing the variable `diary-include-string'."
          (msg (format "No diary entries for %s %s"
                       (concat date-string (if holiday-list ":" ""))
                       (mapconcat 'identity holiday-list "; "))))
+    (calendar-set-mode-line
+     (concat "Diary for " date-string
+             (if holiday-list ": " "")
+             (mapconcat 'identity holiday-list "; ")))
     (if (or (not diary-entries-list)
             (and (not (cdr diary-entries-list))
                  (string-equal (car (cdr (car diary-entries-list))) "")))
@@ -407,10 +411,6 @@ changing the variable `diary-include-string'."
           (setq buffer-read-only t)
           (display-buffer holiday-buffer)
           (message  "No diary entries for %s" date-string))
-      (calendar-set-mode-line
-       (concat "Diary for " date-string
-               (if holiday-list ": " "")
-               (mapconcat 'identity holiday-list "; ")))
       (display-buffer (find-buffer-visiting d-file))
       (message "Preparing diary...done"))))