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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c4100a5e12d1fa61659a3631cdfcd680f8315a9..46e83f0a88b6e49b0c79a819e281963fd6c5c9ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 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).

diff --git a/lisp/startup.el b/lisp/startup.el
index 56281a6b1647f2c22364d60cec6dc3134de35078..6c65b30fe3c48bca5db6f50d287c1c253fcec785 100644 (file)
--- 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.")