emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Read .emacs.local.el after defaults are set

Browse source
This commit is contained in:
Henrik Lissner 2016-10-02 23:23:35 +02:00
parent eba34446a3
commit df851e3fd5
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core-defuns.el
View file

@ -4,8 +4,6 @@
(defmacro doom (_ theme __ font &rest packages) (defmacro doom (_ theme __ font &rest packages)
"Bootstrap DOOM emacs and initialize PACKAGES" "Bootstrap DOOM emacs and initialize PACKAGES"
`(let (file-name-handler-alist) `(let (file-name-handler-alist)
;; Local settings
(load "~/.emacs.local.el" t t)
;; Global constants ;; Global constants
(defconst doom-default-theme ,theme) (defconst doom-default-theme ,theme)
(defconst doom-default-font (defconst doom-default-font
@ -15,13 +13,15 @@
(defconst doom-current-theme doom-default-theme) (defconst doom-current-theme doom-default-theme)
(defconst doom-current-font doom-default-font) (defconst doom-current-font doom-default-font)
;; Local settings
(load "~/.emacs.local.el" t t)
;; Bootstrap
(unless noninteractive (unless noninteractive
,@(mapcar (lambda (pkg) ,@(mapcar (lambda (pkg)
(let ((lib-path (locate-library (symbol-name pkg)))) (let ((lib-path (locate-library (symbol-name pkg))))
(unless lib-path (unless lib-path
(error "Initfile not found: %s" pkg)) (error "Initfile not found: %s" pkg))
`(require ',pkg ,(f-no-ext lib-path)))) `(require ',pkg ,(file-name-sans-extension lib-path))))
packages) packages)
(when window-system (when window-system
(require 'server) (require 'server)