Mercurial > emacs
comparison lisp/startup.el @ 59334:5068fdb7f223
(command-line): No longer load `custom-file'.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Mon, 03 Jan 2005 23:43:34 +0000 |
| parents | 5ba3e8b1f040 |
| children | 67919735cf64 3dcba0bc766b cb67264d6096 |
comparison
equal
deleted
inserted
replaced
| 59333:f23a47fb1568 | 59334:5068fdb7f223 |
|---|---|
| 869 (message "Warning: %s is newer than %s" | 869 (message "Warning: %s is newer than %s" |
| 870 source user-init-file) | 870 source user-init-file) |
| 871 (sit-for 1)) | 871 (sit-for 1)) |
| 872 (setq user-init-file source)))) | 872 (setq user-init-file source)))) |
| 873 | 873 |
| 874 (when (stringp custom-file) | |
| 875 (unless (assoc custom-file load-history) | |
| 876 ;; If the .emacs file has set `custom-file' but hasn't | |
| 877 ;; loaded the file yet, let's load it. | |
| 878 (load custom-file t t))) | |
| 879 | |
| 880 (unless inhibit-default-init | 874 (unless inhibit-default-init |
| 881 (let ((inhibit-startup-message nil)) | 875 (let ((inhibit-startup-message nil)) |
| 882 ;; Users are supposed to be told their rights. | 876 ;; Users are supposed to be told their rights. |
| 883 ;; (Plus how to get help and how to undo.) | 877 ;; (Plus how to get help and how to undo.) |
| 884 ;; Don't you dare turn this off for anyone | 878 ;; Don't you dare turn this off for anyone |