jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't load custom.el twice

Browse source
This commit is contained in:
Bozhidar Batsov 2012-02-15 18:14:03 +02:00
parent 25615df65e
commit 024cd52f00
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init.el
View file

@ -60,12 +60,6 @@ by Prelude.")
(add-to-list 'load-path prelude-vendor-dir) (add-to-list 'load-path prelude-vendor-dir)
(add-to-list 'load-path prelude-personal-dir) (add-to-list 'load-path prelude-personal-dir)
;; config changes made through the customize UI will be store here
(setq custom-file (concat prelude-personal-dir "custom.el"))
(when (file-exists-p custom-file)
(load custom-file))
;; the core stuff ;; the core stuff
(require 'prelude-packages) (require 'prelude-packages)
(require 'prelude-ui) (require 'prelude-ui)
@ -97,6 +91,9 @@ by Prelude.")
(require 'prelude-ack) (require 'prelude-ack)
(require 'prelude-erc) (require 'prelude-erc)
;; config changes made through the customize UI will be store here
(setq custom-file (concat prelude-personal-dir "custom.el"))
;; load the personal settings (this includes `custom-file') ;; load the personal settings (this includes `custom-file')
(when (file-exists-p prelude-personal-dir) (when (file-exists-p prelude-personal-dir)
(mapc 'load (directory-files prelude-personal-dir nil "^[^#].*el$"))) (mapc 'load (directory-files prelude-personal-dir nil "^[^#].*el$")))