From df851e3fd593067f633146ab2012ff8554c2fb9c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 2 Oct 2016 23:23:35 +0200 Subject: [PATCH] Read .emacs.local.el after defaults are set --- core/core-defuns.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core-defuns.el b/core/core-defuns.el index d5976e753..dcc4239bf 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -4,8 +4,6 @@ (defmacro doom (_ theme __ font &rest packages) "Bootstrap DOOM emacs and initialize PACKAGES" `(let (file-name-handler-alist) - ;; Local settings - (load "~/.emacs.local.el" t t) ;; Global constants (defconst doom-default-theme ,theme) (defconst doom-default-font @@ -15,13 +13,15 @@ (defconst doom-current-theme doom-default-theme) (defconst doom-current-font doom-default-font) - + ;; Local settings + (load "~/.emacs.local.el" t t) + ;; Bootstrap (unless noninteractive ,@(mapcar (lambda (pkg) (let ((lib-path (locate-library (symbol-name pkg)))) (unless lib-path (error "Initfile not found: %s" pkg)) - `(require ',pkg ,(f-no-ext lib-path)))) + `(require ',pkg ,(file-name-sans-extension lib-path)))) packages) (when window-system (require 'server)