From b5e0260f4258b7d29c208c5cec271ea6c4ef9f69 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 15 Jan 2023 08:10:33 +0200 Subject: [PATCH] Fix messages displayed when diary is shown * lisp/calendar/diary-lib.el (diary-list-entries): Display the "...done" message only if there's no important message in the echo-area. (Bug#60795) --- lisp/calendar/diary-lib.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index b90ed715fae..44fb5eb5a86 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -880,7 +880,10 @@ LIST-ONLY is non-nil, in which case it just returns the list." (original-date original-date)) (run-hooks 'diary-hook)))))) (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff))) - (or d-incp (message "Preparing diary...done")) + (or d-incp + ;; Don't clobber messages displayed while preparing the diary. + (not (equal (current-message) "Preparing diary...")) + (message "Preparing diary...done")) diary-entries-list))) (defun diary-unhide-everything () -- 2.39.2