[Fix #1208] Correct RegExp collisions while loading personal config.

This commit is contained in:
Andrei Beliankou 2018-11-22 16:53:52 +01:00 committed by Bozhidar Batsov
parent 3a11f84bf5
commit bb152ad383

View file

@ -149,7 +149,9 @@ This is DEPRECATED, use %s instead." prelude-modules-file))
;; 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)
(message "Loading personal configuration files in %s..." prelude-personal-dir) (message "Loading personal configuration files in %s..." prelude-personal-dir)
(mapc 'load (directory-files prelude-personal-dir 't "^[^#\.].*el$|^prelude-modules\.el$"))) (mapc 'load (delete
prelude-modules-file
(directory-files prelude-personal-dir 't "^[^#\.].*\\.el$"))))
(message "Prelude is ready to do thy bidding, Master %s!" current-user) (message "Prelude is ready to do thy bidding, Master %s!" current-user)