Use new names for hooks rather than obsolete aliases

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 6c65b30fe3c48bca5db6f50d287c1c253fcec785..2e8b6b7f8c4c21d1398f1103b27e3278d02422b7 100644 (file)
--- 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.")