[Emacs-diffs] /srv/bzr/emacs/trunk r110721: Avoid a misleading message on C-h C-a.

[Chong Yidong]

------------------------------------------------------------
revno: 110721
fixes bug: http://debbugs.gnu.org/12680
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-29 18:10:15 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-29 10:03:21 +0000
+++ b/lisp/ChangeLog    2012-10-29 10:10:15 +0000
@@ -1,5 +1,8 @@
 2012-10-29  Chong Yidong  <address@hidden>
 
+       * 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).

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-10-23 02:39:13 +0000
+++ b/lisp/startup.el   2012-10-29 10:10:15 +0000
@@ -1693,7 +1693,7 @@
        (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 @@
                 '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.")