aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-01-03 23:43:34 +0000
committerLuc Teirlinck2005-01-03 23:43:34 +0000
commita181a27fbe0ba6dab884d31d9b8db7b31967ed62 (patch)
tree2cfc58443397422175daa1353826a66589aef792
parentad5674f5a14ab073485f1301057ef5ec92e4b144 (diff)
downloademacs-a181a27fbe0ba6dab884d31d9b8db7b31967ed62.tar.gz
emacs-a181a27fbe0ba6dab884d31d9b8db7b31967ed62.zip
(command-line): No longer load `custom-file'.
-rw-r--r--lisp/startup.el6
1 files changed, 0 insertions, 6 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index fee3fb7bd0f..672d20d5445 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -871,12 +871,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
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.