diff options
author | Richard M. Stallman <rms@gnu.org> | 1995-11-14 18:28:49 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1995-11-14 18:28:49 +0000 |
commit | 433c1a5f5d17471e10d23eaaf8d2496d7fc62598 (patch) | |
tree | 50637512b6f146b5b5b1e72a52844eb0b9747ce3 /lisp/startup.el | |
parent | 405ed8b0307d94fd5a07f9c6d0579a09ad55f211 (diff) | |
download | emacs-433c1a5f5d17471e10d23eaaf8d2496d7fc62598.tar.gz |
(command-line-1): Reorganize the initial help output.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r-- | lisp/startup.el | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 7561d231a58..fd43d64f9de 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -615,9 +615,12 @@ this prefix to create a unique file name.") (setq menubar-bindings-done t) (unwind-protect (progn + ;; The convention for this piece of code is that + ;; each piece of output starts with one or two newlines + ;; and does not end with any newlines. (insert (emacs-version) " -Copyright (C) 1995 Free Software Foundation, Inc.\n\n") +Copyright (C) 1995 Free Software Foundation, Inc.") ;; If keys have their default meanings, ;; use precomputed string to save lots of time. (if (and (eq (key-binding "\C-h") 'help-command) @@ -625,13 +628,14 @@ Copyright (C) 1995 Free Software Foundation, Inc.\n\n") (eq (key-binding "\C-x\C-c") 'save-buffers-kill-emacs) (eq (key-binding "\C-ht") 'help-with-tutorial) (eq (key-binding "\C-hi") 'info)) - (insert - "Type C-h for help; C-x u to undo changes. (`C-' means use CTRL key.) + (insert "\n +Type C-h for help; C-x u to undo changes. (`C-' means use CTRL key.) To kill the Emacs job, type C-x C-c. Type C-h t for a tutorial on using Emacs. Type C-h i to enter Info, which you can use to read GNU documentation.") (insert (substitute-command-keys - (format "Type %s for help; \\[advertised-undo] to undo changes. (`C-' means use CTRL key.) + (format "\n +Type %s for help; \\[advertised-undo] to undo changes. (`C-' means use CTRL key.) To kill the Emacs job, type \\[save-buffers-kill-emacs]. Type \\[help-with-tutorial] for a tutorial on using Emacs. Type \\[info] to enter Info, which you can use to read GNU documentation." @@ -644,7 +648,7 @@ Type \\[info] to enter Info, which you can use to read GNU documentation." ;; if that is not with the mouse. (if (not (assq 'display (frame-parameters))) (if (eq (key-binding "\M-`") 'tmm-menubar) - (insert "\n\nType M-` to use the menu bar.") + (insert "\n\nType ESC ` or Meta-` to use the menu bar.") (insert (substitute-command-keys "\n\nType \\[tmm-menubar] to use the menu bar.")))) @@ -652,28 +656,27 @@ Type \\[info] to enter Info, which you can use to read GNU documentation." ;; window systems, but do have mouse support. (if (or (memq system-type '(msdos windowsnt)) window-system) - (insert " + (insert "\n C-mouse-3 (third mouse button, with Control) gets a mode-specific menu.")) - (insert "\n") + (if (directory-files "~/" nil "\\`\\.saves-" t) + (insert "\n\nIf an Emacs session crashed recently,\n" + "type M-x recover-session RET to recover" + " the files you were editing.")) + (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) (eq (key-binding "\C-h\C-d") 'describe-distribution) (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) (insert - " + "\n GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details. You may give out copies of Emacs; type C-h C-c to see the conditions. Type C-h C-d for information on getting the latest version.") (insert (substitute-command-keys - " + "\n GNU Emacs comes with ABSOLUTELY NO WARRANTY; type \\[describe-no-warranty] for full details. You may give out copies of Emacs; type \\[describe-copying] to see the conditions. Type \\[describe-distribution] for information on getting the latest version."))) - (if (directory-files "~/" nil "\\`\\.saves-" t) - (insert "\n\nIf an Emacs session crashed recently,\n" - "type M-x recover-session RET to recover" - " the files you were editing.")) - (set-buffer-modified-p nil) (sit-for 120)) (save-excursion |