Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/startup.el Mon Jan 03 22:53:30 2005 +0000 +++ b/lisp/startup.el Mon Jan 03 23:43:34 2005 +0000 @@ -871,12 +871,6 @@ (sit-for 1)) (setq user-init-file source)))) - (when (stringp custom-file) - (unless (assoc custom-file load-history) - ;; If the .emacs file has set `custom-file' but hasn't - ;; loaded the file yet, let's load it. - (load custom-file t t))) - (unless inhibit-default-init (let ((inhibit-startup-message nil)) ;; Users are supposed to be told their rights.