aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1998-06-13 06:16:32 +0000
committerRichard M. Stallman1998-06-13 06:16:32 +0000
commit341ce5a77de41be4356265b1ef9c78b30e4b113a (patch)
tree1095ac8761a5e38df5b30fa6b18868ccd0406dbd
parent4cc4a962cadab43436df492f529a6b9b569a0b89 (diff)
downloademacs-341ce5a77de41be4356265b1ef9c78b30e4b113a.tar.gz
emacs-341ce5a77de41be4356265b1ef9c78b30e4b113a.zip
(command-line-1): Check that user-init-file non-nil.
-rw-r--r--lisp/startup.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 07c6c241f32..8350da23658 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -753,6 +753,7 @@ If this is nil, no message will be displayed."
753(defun command-line-1 (command-line-args-left) 753(defun command-line-1 (command-line-args-left)
754 (or noninteractive (input-pending-p) init-file-had-error 754 (or noninteractive (input-pending-p) init-file-had-error
755 (and inhibit-startup-echo-area-message 755 (and inhibit-startup-echo-area-message
756 user-init-file
756 (or (and (get 'inhibit-startup-echo-area-message 'saved-value) 757 (or (and (get 'inhibit-startup-echo-area-message 'saved-value)
757 (equal inhibit-startup-echo-area-message 758 (equal inhibit-startup-echo-area-message
758 (if (string= init-file-user "") 759 (if (string= init-file-user "")