Merge pull request #18 from hdhoang/master

Load custom-file before loading modules
This commit is contained in:
Bozhidar Batsov 2011-10-28 02:04:38 -07:00
commit d1ff11da15

View file

@ -59,6 +59,10 @@ 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"))
(load custom-file 'noerror)
;; the core stuff ;; the core stuff
(require 'prelude-ui) (require 'prelude-ui)
(require 'prelude-packages) (require 'prelude-packages)
@ -81,8 +85,6 @@ by Prelude.")
(require 'prelude-scheme) (require 'prelude-scheme)
(require 'prelude-xml) (require 'prelude-xml)
;; config changes made through the customize UI will be store here
(setq custom-file (concat prelude-personal-dir "custom.el"))
;; load the personal settings ;; load the personal settings
(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$")))