diff options
| author | Richard M. Stallman | 1994-01-07 11:29:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-01-07 11:29:42 +0000 |
| commit | f9890ae6334655efc4d647082acb01f18303e1b2 (patch) | |
| tree | 94dc212a8396b3f69c34d77e3931ebfc916ff82a | |
| parent | 812daf81cc214d42467a8c6614a02dc4872cdc48 (diff) | |
| download | emacs-f9890ae6334655efc4d647082acb01f18303e1b2.tar.gz emacs-f9890ae6334655efc4d647082acb01f18303e1b2.zip | |
(command-line-1): Improve echo area message wording.
Don't print it if C-h C-p has been redefined.
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index b48b742da7d..c006ad4fc16 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -327,10 +327,8 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.") | |||
| 327 | 327 | ||
| 328 | (defun command-line-1 (command-line-args-left) | 328 | (defun command-line-1 (command-line-args-left) |
| 329 | (or noninteractive (input-pending-p) init-file-had-error | 329 | (or noninteractive (input-pending-p) init-file-had-error |
| 330 | (message (if (eq (key-binding "\C-h\C-p") 'describe-project) | 330 | (if (eq (key-binding "\C-h\C-p") 'describe-project) |
| 331 | "For information about the GNU Project and its goals, type C-h C-p." | 331 | (message "For more about the GNU Project, of which GNU Emacs is part, type C-h C-p."))) |
| 332 | (substitute-command-keys | ||
| 333 | "For information about the GNU Project and its goals, type \\[describe-project].")))) | ||
| 334 | (if (null command-line-args-left) | 332 | (if (null command-line-args-left) |
| 335 | (cond ((and (not inhibit-startup-message) (not noninteractive) | 333 | (cond ((and (not inhibit-startup-message) (not noninteractive) |
| 336 | ;; Don't clobber a non-scratch buffer if init file | 334 | ;; Don't clobber a non-scratch buffer if init file |