(command-line-1): Display a message in the echo area.

diff --git a/lisp/startup.el b/lisp/startup.el
index 4ad6213ba6cc511d8b70db92830ac91f84ead564..cb701a3d6ce005b64516f6242396e4234fd79485 100644 (file)
--- 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