summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-11-04 16:54:25 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-11-04 16:54:25 +0000
commit2eb92184e95b6e8f5c0081d5a50233eb4cd827d7 (patch)
tree8d8e39dffdef0eb5bab2fa7d8b2b436cd50cec7e
parentbd98d0e32c1629d314de19995dffe751266b46f5 (diff)
downloademacs-2eb92184e95b6e8f5c0081d5a50233eb4cd827d7.tar.gz
(startup-echo-area-message): Display a different message in daemon
mode. Suggested by Stephen Turnbull.
-rw-r--r--lisp/startup.el14
1 files changed, 8 insertions, 6 deletions
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))