diff options
| author | Richard M. Stallman | 1994-01-06 04:28:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-01-06 04:28:36 +0000 |
| commit | a4c5c70594f6f9cfb6a8414abdced5ff0490d280 (patch) | |
| tree | 146d4ff74b9b6bc836b2d21e09d756d052d22760 | |
| parent | e3938952c8d4ee2cce537b80d68f38b5fee92249 (diff) | |
| download | emacs-a4c5c70594f6f9cfb6a8414abdced5ff0490d280.tar.gz emacs-a4c5c70594f6f9cfb6a8414abdced5ff0490d280.zip | |
(command-line): Set user-init-file.
| -rw-r--r-- | lisp/startup.el | 28 |
1 files 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'.") | |||
| 262 | (function | 262 | (function |
| 263 | (lambda () | 263 | (lambda () |
| 264 | (if init-file-user | 264 | (if init-file-user |
| 265 | (progn (load (if (eq system-type 'vax-vms) | 265 | (progn |
| 266 | "sys$login:.emacs" | 266 | (setq user-init-file |
| 267 | (concat "~" init-file-user "/.emacs")) | 267 | (cond |
| 268 | t t t) | 268 | ((eq system-type 'ms-dos) |
| 269 | (or inhibit-default-init | 269 | (concat "~" init-file-user "/_emacs")) |
| 270 | (let ((inhibit-startup-message nil)) | 270 | ((eq system-type 'vax-vms) |
| 271 | ;; Users are supposed to be told their rights. | 271 | "sys$login:.emacs") |
| 272 | ;; (Plus how to get help and how to undo.) | 272 | (t |
| 273 | ;; Don't you dare turn this off for anyone | 273 | (concat "~" init-file-user "/.emacs")))) |
| 274 | ;; except yourself. | 274 | (load user-init-file t t t) |
| 275 | (load "default" t t))))))))) | 275 | (or inhibit-default-init |
| 276 | (let ((inhibit-startup-message nil)) | ||
| 277 | ;; Users are supposed to be told their rights. | ||
| 278 | ;; (Plus how to get help and how to undo.) | ||
| 279 | ;; Don't you dare turn this off for anyone | ||
| 280 | ;; except yourself. | ||
| 281 | (load "default" t t))))))))) | ||
| 276 | (if init-file-debug | 282 | (if init-file-debug |
| 277 | ;; Do this without a condition-case if the user wants to debug. | 283 | ;; Do this without a condition-case if the user wants to debug. |
| 278 | (funcall inner) | 284 | (funcall inner) |