Commit 5c2f2631 authored by Chong Yidong's avatar Chong Yidong
Browse files

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
parent e84cad57
2012-10-29 Chong Yidong <cyd@gnu.org>
 
* 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).
......
......@@ -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.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment