Mercurial > emacs
comparison lisp/calendar/diary-lib.el @ 26330:d0f895577892
(simple-diary-display): Reset modeline even if
there are no diary entries since the diary buffer may be displayed.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 03 Nov 1999 15:09:11 +0000 |
| parents | 2d1ef4eb8297 |
| children | cfa579c1229f |
comparison
equal
deleted
inserted
replaced
| 26329:5dfb5127e9ee | 26330:d0f895577892 |
|---|---|
| 390 (let* ((holiday-list (if holidays-in-diary-buffer | 390 (let* ((holiday-list (if holidays-in-diary-buffer |
| 391 (check-calendar-holidays original-date))) | 391 (check-calendar-holidays original-date))) |
| 392 (msg (format "No diary entries for %s %s" | 392 (msg (format "No diary entries for %s %s" |
| 393 (concat date-string (if holiday-list ":" "")) | 393 (concat date-string (if holiday-list ":" "")) |
| 394 (mapconcat 'identity holiday-list "; ")))) | 394 (mapconcat 'identity holiday-list "; ")))) |
| 395 (calendar-set-mode-line | |
| 396 (concat "Diary for " date-string | |
| 397 (if holiday-list ": " "") | |
| 398 (mapconcat 'identity holiday-list "; "))) | |
| 395 (if (or (not diary-entries-list) | 399 (if (or (not diary-entries-list) |
| 396 (and (not (cdr diary-entries-list)) | 400 (and (not (cdr diary-entries-list)) |
| 397 (string-equal (car (cdr (car diary-entries-list))) ""))) | 401 (string-equal (car (cdr (car diary-entries-list))) ""))) |
| 398 (if (<= (length msg) (frame-width)) | 402 (if (<= (length msg) (frame-width)) |
| 399 (message "%s" msg) | 403 (message "%s" msg) |
| 405 (goto-char (point-min)) | 409 (goto-char (point-min)) |
| 406 (set-buffer-modified-p nil) | 410 (set-buffer-modified-p nil) |
| 407 (setq buffer-read-only t) | 411 (setq buffer-read-only t) |
| 408 (display-buffer holiday-buffer) | 412 (display-buffer holiday-buffer) |
| 409 (message "No diary entries for %s" date-string)) | 413 (message "No diary entries for %s" date-string)) |
| 410 (calendar-set-mode-line | |
| 411 (concat "Diary for " date-string | |
| 412 (if holiday-list ": " "") | |
| 413 (mapconcat 'identity holiday-list "; "))) | |
| 414 (display-buffer (find-buffer-visiting d-file)) | 414 (display-buffer (find-buffer-visiting d-file)) |
| 415 (message "Preparing diary...done")))) | 415 (message "Preparing diary...done")))) |
| 416 | 416 |
| 417 (defun fancy-diary-display () | 417 (defun fancy-diary-display () |
| 418 "Prepare a diary buffer with relevant entries in a fancy, noneditable form. | 418 "Prepare a diary buffer with relevant entries in a fancy, noneditable form. |