From 5c2f2631f8c64dba6367610acbd01304049631c9 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 29 Oct 2012 18:10:15 +0800 Subject: [PATCH] Avoid a misleading message on C-h C-a. * lisp/startup.el (startup-echo-area-message): New arg. (fancy-about-screen): Avoid a misleading message. Fixes: debbugs:12680 --- lisp/ChangeLog | 3 +++ lisp/startup.el | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c4100a5e12..46e83f0a88b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-10-29 Chong Yidong + * startup.el (startup-echo-area-message): New arg. + (fancy-about-screen): Avoid a misleading message (Bug#12680). + * thingatpt.el (thing-at-point): Doc fix (Bug#12691). * imenu.el (imenu): Inhibit push-mark message (Bug#12726). diff --git a/lisp/startup.el b/lisp/startup.el index 56281a6b164..6c65b30fe3c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1693,7 +1693,7 @@ splash screen in another window." (force-mode-line-update)) (use-local-map splash-screen-keymap) (setq tab-width 22) - (message "%s" (startup-echo-area-message)) + (message "%s" (startup-echo-area-message t)) (setq buffer-read-only t) (goto-char (point-min)) (forward-line 3)))) @@ -2017,8 +2017,8 @@ Type \\[describe-distribution] for information on ")) 'follow-link t) (insert "\tBuying printed manuals from the FSF\n")) -(defun startup-echo-area-message () - (cond ((daemonp) +(defun startup-echo-area-message (&optional about-screen-message) + (cond ((and (daemonp) (not about-screen-message)) "Starting Emacs daemon.") ((eq (key-binding "\C-h\C-a") 'about-emacs) "For information about GNU Emacs and the GNU system, type C-h C-a.") -- 2.39.2