Mercurial > emacs
comparison lisp/startup.el @ 22475:3bd923346a65
(command-line-1): Check that user-init-file non-nil.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 13 Jun 1998 06:16:32 +0000 |
| parents | 38486c386abb |
| children | 6c1c72f0145b |
comparison
equal
deleted
inserted
replaced
| 22474:927f6e2f680b | 22475:3bd923346a65 |
|---|---|
| 751 :type 'string) | 751 :type 'string) |
| 752 | 752 |
| 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 "") |
| 759 (user-login-name) | 760 (user-login-name) |
| 760 init-file-user))) | 761 init-file-user))) |