From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 4 Nov 2008 16:54:25 +0000 (+0000)
Subject: (startup-echo-area-message): Display a different message in daemon
X-Git-Tag: emacs-pretest-23.0.90~1971
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2eb92184e95b6e8f5c0081d5a50233eb4cd827d7;p=emacs.git

(startup-echo-area-message): Display a different message in daemon
mode.  Suggested by Stephen Turnbull.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 1f571c63bfc..1532093ceec 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1985,12 +1985,14 @@ Type \\[describe-distribution] for information on "))
   (insert "\tBuying printed manuals from the FSF\n"))
 
 (defun startup-echo-area-message ()
-  (if (eq (key-binding "\C-h\C-a") 'about-emacs)
-      "For information about GNU Emacs and the GNU system, type C-h C-a."
-    (substitute-command-keys
-     "For information about GNU Emacs and the GNU system, type \
-\\[about-emacs].")))
-
+  (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.")
+	(t
+	 (substitute-command-keys
+	  "For information about GNU Emacs and the GNU system, type \
+\\[about-emacs]."))))
 
 (defun display-startup-echo-area-message ()
   (let ((resize-mini-windows t))