Commit 2230fa5b authored by Chong Yidong's avatar Chong Yidong
Browse files

Fix last change.

* lisp/startup.el (fancy-about-screen): Don't message at all.
(startup-echo-area-message): Revert last change.

Fixes: debbugs:12680
parent 5c2f2631
2012-10-29 Chong Yidong <cyd@gnu.org> 2012-10-29 Chong Yidong <cyd@gnu.org>
   
* startup.el (startup-echo-area-message): New arg. * startup.el (fancy-about-screen): Don't message (Bug#12680).
(fancy-about-screen): Avoid a misleading message (Bug#12680).
   
* thingatpt.el (thing-at-point): Doc fix (Bug#12691). * thingatpt.el (thing-at-point): Doc fix (Bug#12691).
   
......
...@@ -1693,7 +1693,6 @@ splash screen in another window." ...@@ -1693,7 +1693,6 @@ splash screen in another window."
(force-mode-line-update)) (force-mode-line-update))
(use-local-map splash-screen-keymap) (use-local-map splash-screen-keymap)
(setq tab-width 22) (setq tab-width 22)
(message "%s" (startup-echo-area-message t))
(setq buffer-read-only t) (setq buffer-read-only t)
(goto-char (point-min)) (goto-char (point-min))
(forward-line 3)))) (forward-line 3))))
...@@ -2017,8 +2016,8 @@ Type \\[describe-distribution] for information on ")) ...@@ -2017,8 +2016,8 @@ Type \\[describe-distribution] for information on "))
'follow-link t) 'follow-link t)
(insert "\tBuying printed manuals from the FSF\n")) (insert "\tBuying printed manuals from the FSF\n"))
(defun startup-echo-area-message (&optional about-screen-message) (defun startup-echo-area-message ()
(cond ((and (daemonp) (not about-screen-message)) (cond ((daemonp)
"Starting Emacs daemon.") "Starting Emacs daemon.")
((eq (key-binding "\C-h\C-a") 'about-emacs) ((eq (key-binding "\C-h\C-a") 'about-emacs)
"For information about GNU Emacs and the GNU system, type C-h C-a.") "For information about GNU Emacs and the GNU system, type C-h C-a.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment