changeset 99381:fdfbe3e66ebc

(startup-echo-area-message): Display a different message in daemon mode. Suggested by Stephen Turnbull.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 04 Nov 2008 16:54:25 +0000
parents 3106ccb4fc25
children f1a064081e2e
files lisp/startup.el
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/startup.el	Tue Nov 04 16:54:15 2008 +0000
+++ b/lisp/startup.el	Tue Nov 04 16:54:25 2008 +0000
@@ -1985,12 +1985,14 @@
   (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))