From: Chong Yidong <cyd@gnu.org>
Date: Mon, 29 Oct 2012 10:14:50 +0000 (+0800)
Subject: Fix last change.
X-Git-Tag: emacs-24.2.90~209^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2230fa5bbf67bfefe797d77d4ed73c5c6342209b;p=emacs.git

Fix last change.

* lisp/startup.el (fancy-about-screen): Don't message at all.
(startup-echo-area-message): Revert last change.

Fixes: debbugs:12680
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46e83f0a88b..d02da87446c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,6 @@
 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).
+	* startup.el (fancy-about-screen): Don't message (Bug#12680).
 
 	* thingatpt.el (thing-at-point): Doc fix (Bug#12691).
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 6c65b30fe3c..2e8b6b7f8c4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1693,7 +1693,6 @@ 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 t))
       (setq buffer-read-only t)
       (goto-char (point-min))
       (forward-line 3))))
@@ -2017,8 +2016,8 @@ Type \\[describe-distribution] for information on "))
 		 'follow-link t)
   (insert "\tBuying printed manuals from the FSF\n"))
 
-(defun startup-echo-area-message (&optional about-screen-message)
-  (cond ((and (daemonp) (not about-screen-message))
+(defun startup-echo-area-message ()
+  (cond ((daemonp)
 	 "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.")