aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2008-02-28 22:59:12 +0000
committerJuri Linkov2008-02-28 22:59:12 +0000
commitbd8b0ebb99ea3b594b778d072e38b676cc35a0bf (patch)
treee906014ba8a38ada6b3de3ab7ec34382219ec104
parent8d86c6da46f3c7fa1d126fd02b21233049b8ff4a (diff)
downloademacs-bd8b0ebb99ea3b594b778d072e38b676cc35a0bf.tar.gz
emacs-bd8b0ebb99ea3b594b778d072e38b676cc35a0bf.zip
(startup-echo-area-message): Check for about-emacs.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3e3ccc66ae..2a813b43f37 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-02-28 Kim F. Storm <storm@cua.dk>
2
3 * startup.el (startup-echo-area-message): Check for about-emacs.
4
12008-02-28 Juri Linkov <juri@jurta.org> 52008-02-28 Juri Linkov <juri@jurta.org>
2 6
3 * startup.el: Always add initial message to *scratch* buffer if 7 * startup.el: Always add initial message to *scratch* buffer if
diff --git a/lisp/startup.el b/lisp/startup.el
index 5238a1e5936..6d99e27fdef 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1893,7 +1893,7 @@ Type \\[describe-distribution] for information on "))
1893 (insert "\tBuying printed manuals from the FSF\n")) 1893 (insert "\tBuying printed manuals from the FSF\n"))
1894 1894
1895(defun startup-echo-area-message () 1895(defun startup-echo-area-message ()
1896 (if (eq (key-binding "\C-h\C-p") 'describe-project) 1896 (if (eq (key-binding "\C-h\C-a") 'about-emacs)
1897 "For information about GNU Emacs and the GNU system, type C-h C-a." 1897 "For information about GNU Emacs and the GNU system, type C-h C-a."
1898 (substitute-command-keys 1898 (substitute-command-keys
1899 "For information about GNU Emacs and the GNU system, type \ 1899 "For information about GNU Emacs and the GNU system, type \