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

Merge pull request #12 from hdhoang/master

Browse source 
don't load custom.el twice
This commit is contained in:
Bozhidar Batsov 2011-10-16 02:25:25 -07:00
commit 0cf8397b2e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init.el
View file

@ -81,11 +81,10 @@ by Prelude.")
(require 'prelude-scheme) (require 'prelude-scheme)
(require 'prelude-xml) (require 'prelude-xml)
;; load the personal settings
(when (file-exists-p prelude-personal-dir)
(mapc 'load (directory-files prelude-personal-dir nil "^[^#].*el$")))
;; config changes made through the customize UI will be store here ;; config changes made through the customize UI will be store here
(setq custom-file (concat prelude-personal-dir "custom.el")) (setq custom-file (concat prelude-personal-dir "custom.el"))
(load custom-file 'noerror) ;; load the personal settings
(when (file-exists-p prelude-personal-dir)
(mapc 'load (directory-files prelude-personal-dir nil "^[^#].*el$"))
;;; init.el ends here ;;; init.el ends here