aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-11-04 16:54:25 +0000
committerChong Yidong2008-11-04 16:54:25 +0000
commit2eb92184e95b6e8f5c0081d5a50233eb4cd827d7 (patch)
tree8d8e39dffdef0eb5bab2fa7d8b2b436cd50cec7e
parentbd98d0e32c1629d314de19995dffe751266b46f5 (diff)
downloademacs-2eb92184e95b6e8f5c0081d5a50233eb4cd827d7.tar.gz
emacs-2eb92184e95b6e8f5c0081d5a50233eb4cd827d7.zip
(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 "))
1985 (insert "\tBuying printed manuals from the FSF\n")) 1985 (insert "\tBuying printed manuals from the FSF\n"))
1986 1986
1987(defun startup-echo-area-message () 1987(defun startup-echo-area-message ()
1988 (if (eq (key-binding "\C-h\C-a") 'about-emacs) 1988 (cond ((daemonp)
1989 "For information about GNU Emacs and the GNU system, type C-h C-a." 1989 "Starting Emacs daemon.")
1990 (substitute-command-keys 1990 ((eq (key-binding "\C-h\C-a") 'about-emacs)
1991 "For information about GNU Emacs and the GNU system, type \ 1991 "For information about GNU Emacs and the GNU system, type C-h C-a.")
1992\\[about-emacs]."))) 1992 (t
1993 1993 (substitute-command-keys
1994 "For information about GNU Emacs and the GNU system, type \
1995\\[about-emacs]."))))
1994 1996
1995(defun display-startup-echo-area-message () 1997(defun display-startup-echo-area-message ()
1996 (let ((resize-mini-windows t)) 1998 (let ((resize-mini-windows t))