# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 928545494 0
# Node ID 649cfea33b84c915131c4ec67e079a94fa0bd13a
# Parent  6486c94c16aed328042466be5a4a5018dc797b19
(command-line): Don't set user-init-file directly;
tell `load' to set it.

diff -r 6486c94c16ae -r 649cfea33b84 lisp/startup.el
--- a/lisp/startup.el	Sat Jun 05 01:17:08 1999 +0000
+++ b/lisp/startup.el	Sat Jun 05 01:18:14 1999 +0000
@@ -702,8 +702,7 @@
 	   (function
 	    (lambda ()
 	      (if init-file-user
-		  (progn
-		    (setq user-init-file 
+		  (let ((user-init-file-1
 			  (cond 
 			   ((eq system-type 'ms-dos)
 			    (concat "~" init-file-user "/_emacs"))
@@ -714,8 +713,11 @@
 			   ((eq system-type 'vax-vms) 
 			    "sys$login:.emacs")
 			   (t 
-			    (concat "~" init-file-user "/.emacs"))))
-		    (load user-init-file t t)
+			    (concat "~" init-file-user "/.emacs")))))
+		    ;; This tells `load' to store the file name found
+		    ;; into user-init-file.
+		    (setq user-init-file t)
+		    (load user-init-file-1 t t)
 		    (or inhibit-default-init
 			(let ((inhibit-startup-message nil))
 			  ;; Users are supposed to be told their rights.