Mercurial > emacs
comparison lisp/startup.el @ 24819:649cfea33b84
(command-line): Don't set user-init-file directly;
tell `load' to set it.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Sat, 05 Jun 1999 01:18:14 +0000 |
parents | 3699bc348208 |
children | edc13d60943c |
comparison
equal
deleted
inserted
replaced
24818:6486c94c16ae | 24819:649cfea33b84 |
---|---|
700 ;; This function actually reads the init files. | 700 ;; This function actually reads the init files. |
701 (inner | 701 (inner |
702 (function | 702 (function |
703 (lambda () | 703 (lambda () |
704 (if init-file-user | 704 (if init-file-user |
705 (progn | 705 (let ((user-init-file-1 |
706 (setq user-init-file | |
707 (cond | 706 (cond |
708 ((eq system-type 'ms-dos) | 707 ((eq system-type 'ms-dos) |
709 (concat "~" init-file-user "/_emacs")) | 708 (concat "~" init-file-user "/_emacs")) |
710 ((eq system-type 'windows-nt) | 709 ((eq system-type 'windows-nt) |
711 (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$") | 710 (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$") |
712 "~/.emacs" | 711 "~/.emacs" |
713 "~/_emacs")) | 712 "~/_emacs")) |
714 ((eq system-type 'vax-vms) | 713 ((eq system-type 'vax-vms) |
715 "sys$login:.emacs") | 714 "sys$login:.emacs") |
716 (t | 715 (t |
717 (concat "~" init-file-user "/.emacs")))) | 716 (concat "~" init-file-user "/.emacs"))))) |
718 (load user-init-file t t) | 717 ;; This tells `load' to store the file name found |
718 ;; into user-init-file. | |
719 (setq user-init-file t) | |
720 (load user-init-file-1 t t) | |
719 (or inhibit-default-init | 721 (or inhibit-default-init |
720 (let ((inhibit-startup-message nil)) | 722 (let ((inhibit-startup-message nil)) |
721 ;; Users are supposed to be told their rights. | 723 ;; Users are supposed to be told their rights. |
722 ;; (Plus how to get help and how to undo.) | 724 ;; (Plus how to get help and how to undo.) |
723 ;; Don't you dare turn this off for anyone | 725 ;; Don't you dare turn this off for anyone |