Mercurial > emacs

changeset 25055:a29c760f50ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(command-line): If we don't find the user's init file, set user-init-file to nil.
author Karl Heuer <kwzh@gnu.org>
date Sun, 25 Jul 1999 05:44:56 +0000
parents 888326cb8ffb
children d29c2ded5971
files lisp/startup.el
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/startup.el	Sat Jul 24 13:11:43 1999 +0000
+++ b/lisp/startup.el	Sun Jul 25 05:44:56 1999 +0000
@@ -724,6 +724,11 @@
 		    ;; into user-init-file.
 		    (setq user-init-file t)
 		    (load user-init-file-1 t t)
+		    ;; If we did not find the user's init file,
+		    ;; set user-init-file conclusively to nil;
+		    ;; don't let it be set from default.el.
+		    (if (eq user-init-file t)
+			(setq user-init-file nil))
 		    (or inhibit-default-init
 			(let ((inhibit-startup-message nil))
 			  ;; Users are supposed to be told their rights.