Merge from emacs--devo--0

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 8ab50efa877d7989a09204d503367b22d13cb93c..a3c0a25511f7faddfcf5f6744d7d1224a45e79af 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,8 @@
 ;;; startup.el --- process Emacs shell arguments
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1536,8 +1537,6 @@ splash screen in another window."
        (dolist (text fancy-about-text)
          (apply #'fancy-splash-insert text)
          (insert "\n"))
-       (unless (current-message)
-         (message "%s" (or fancy-splash-help-echo "")))
        (set-buffer-modified-p nil)
        (goto-char (point-min))
        (force-mode-line-update))