aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-02-26 14:17:29 +0000
committerGerd Moellmann2001-02-26 14:17:29 +0000
commit01459648745dd3aaa3c545d05047bce479ae4500 (patch)
treefbb1d112343b5cd10741a563345a9ac8818ad565
parent38790755118ec9206667ff633c6402abb41863a4 (diff)
downloademacs-01459648745dd3aaa3c545d05047bce479ae4500.tar.gz
emacs-01459648745dd3aaa3c545d05047bce479ae4500.zip
(command-line-1): Add info about ordering manuals
to the not so fancy splash screens.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/startup.el7
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4dcd25aa0c..4ebc0b76d1e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,14 @@
12001-02-26 Gerd Moellmann <gerd@gnu.org>
2
3 * help.el (view-order-manuals): Use goto-address.
4
5 * startup.el (command-line-1): Add info about ordering manuals
6 to the not so fancy splash screens.
7
12001-02-26 Andre Spiegel <spiegel@gnu.org> 82001-02-26 Andre Spiegel <spiegel@gnu.org>
2 9
3 * vc.el (vc-default-workfile-unchanged-p, 10 * vc.el (vc-default-workfile-unchanged-p)
4 vc-default-latest-on-branch-p): Add missing BACKEND argument. 11 (vc-default-latest-on-branch-p): Add missing BACKEND argument.
5 12
62001-02-26 Gerd Moellmann <gerd@gnu.org> 132001-02-26 Gerd Moellmann <gerd@gnu.org>
7 14
diff --git a/lisp/startup.el b/lisp/startup.el
index 435c4ab3bc3..b04fd1e65d6 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1310,6 +1310,7 @@ Emacs FAQ Frequently asked questions and answers
1310\(Non)Warranty GNU Emacs comes with ABSOLUTELY NO WARRANTY 1310\(Non)Warranty GNU Emacs comes with ABSOLUTELY NO WARRANTY
1311Copying Conditions Conditions for redistributing and changing Emacs. 1311Copying Conditions Conditions for redistributing and changing Emacs.
1312Getting New Versions How to obtain the latest version of Emacs. 1312Getting New Versions How to obtain the latest version of Emacs.
1313Ordering Manuals How to order manuals from the FSF.
1313") 1314")
1314 (insert "\n\n" (emacs-version) 1315 (insert "\n\n" (emacs-version)
1315 " 1316 "
@@ -1326,14 +1327,16 @@ Copyright (C) 2000 Free Software Foundation, Inc.")))
1326 (insert " 1327 (insert "
1327Get help C-h (Hold down CTRL and press h) 1328Get help C-h (Hold down CTRL and press h)
1328Undo changes C-x u Exit Emacs C-x C-c 1329Undo changes C-x u Exit Emacs C-x C-c
1329Get a tutorial C-h t Use Info to read docs C-h i") 1330Get a tutorial C-h t Use Info to read docs C-h i
1331Ordering manuals C-h RET")
1330 (insert (substitute-command-keys 1332 (insert (substitute-command-keys
1331 (format "\n 1333 (format "\n
1332Get help %s 1334Get help %s
1333Undo changes \\[advertised-undo] 1335Undo changes \\[advertised-undo]
1334Exit Emacs \\[save-buffers-kill-emacs] 1336Exit Emacs \\[save-buffers-kill-emacs]
1335Get a tutorial \\[help-with-tutorial] 1337Get a tutorial \\[help-with-tutorial]
1336Use Info to read docs \\[info]" 1338Use Info to read docs \\[info]
1339Ordering manuals \\[view-order-manuals]"
1337 (let ((where (where-is-internal 1340 (let ((where (where-is-internal
1338 'help-command nil t))) 1341 'help-command nil t)))
1339 (if where 1342 (if where