summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-11-15 09:22:23 +0000
committerRichard M. Stallman <rms@gnu.org>1993-11-15 09:22:23 +0000
commite8997612fd087f34c7fab09cbfc4c7978fd9474a (patch)
treefb5b0ac2e922791dab585ede8293c6a6003806fa /lisp/startup.el
parent6f034b1c2223462019fafddcd6f49435c264b1d5 (diff)
downloademacs-e8997612fd087f34c7fab09cbfc4c7978fd9474a.tar.gz
(command-line-1): Display a message in the echo area.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 4ad6213ba6c..cb701a3d6ce 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -304,6 +304,11 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
(if noninteractive (kill-emacs t)))
(defun command-line-1 (command-line-args-left)
+ (or noninteractive (input-pending-p)
+ (message (if (eq (key-binding "\C-h\C-p") 'describe-project)
+ "For information about the GNU Project and its goals, type C-h C-p."
+ (substitute-command-keys
+ "For information about the GNU Project and its goals, type \\[describe-project]."))))
(if (null command-line-args-left)
(cond ((and (not inhibit-startup-message) (not noninteractive)
;; Don't clobber a non-scratch buffer if init file
@@ -427,8 +432,6 @@ Type \\[describe-distribution] for information on getting the latest version."))
(if (> file-count 2)
(or (get-buffer-window first-file-buffer)
(progn (other-window 1)
- (buffer-menu))))))
- (message (substitute-command-keys
- "For information about the GNU project and its goals, type \\[describe-project].")))
+ (buffer-menu)))))))
;;; startup.el ends here