From a4c5c70594f6f9cfb6a8414abdced5ff0490d280 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 6 Jan 1994 04:28:36 +0000 Subject: [PATCH] (command-line): Set user-init-file. --- lisp/startup.el | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index ea5a1651d51..b48b742da7d 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -262,17 +262,23 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.") (function (lambda () (if init-file-user - (progn (load (if (eq system-type 'vax-vms) - "sys$login:.emacs" - (concat "~" init-file-user "/.emacs")) - t t t) - (or inhibit-default-init - (let ((inhibit-startup-message nil)) - ;; Users are supposed to be told their rights. - ;; (Plus how to get help and how to undo.) - ;; Don't you dare turn this off for anyone - ;; except yourself. - (load "default" t t))))))))) + (progn + (setq user-init-file + (cond + ((eq system-type 'ms-dos) + (concat "~" init-file-user "/_emacs")) + ((eq system-type 'vax-vms) + "sys$login:.emacs") + (t + (concat "~" init-file-user "/.emacs")))) + (load user-init-file t t t) + (or inhibit-default-init + (let ((inhibit-startup-message nil)) + ;; Users are supposed to be told their rights. + ;; (Plus how to get help and how to undo.) + ;; Don't you dare turn this off for anyone + ;; except yourself. + (load "default" t t))))))))) (if init-file-debug ;; Do this without a condition-case if the user wants to debug. (funcall inner) -- 2.39.5