From cd713291f3dbdadc760ba49727cc2f7288b6160f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 20 Feb 2017 13:11:12 -0500 Subject: [PATCH] Remove compile-lite task + simple-p option in doom/recompile --- Makefile | 3 --- core/core-packages.el | 19 +++++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 22c62c65b..8dea39f99 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,6 @@ autoloads: init.el compile: init.el clean @$(EMACS) -l core/core.el -f 'doom/recompile' -compile-lite: init.el clean - @$(EMACS) -l core/core.el --eval '(doom/recompile t)' - clean: @rm -fv init.elc @find {core,modules} -type f -iname '*.elc' -exec rm \-fv {} \; diff --git a/core/core-packages.el b/core/core-packages.el index 769feda27..99f500bed 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -428,7 +428,7 @@ There should be a measurable benefit from this, but it may take a while." (interactive) ;; Ensure all relevant config files are loaded. This way we don't need ;; eval-when-compile and require blocks scattered all over. - (doom-initialize-packages t noninteractive) + (doom-initialize-packages (not noninteractive) noninteractive) (let ((targets (append (list (expand-file-name "init.el" doom-emacs-dir) (expand-file-name "core.el" doom-core-dir)) @@ -436,15 +436,14 @@ There should be a measurable benefit from this, but it may take a while." (file-expand-wildcards (expand-file-name "autoload/*.el" doom-core-dir)))) (n 0) results) - (unless simple-p - (dolist (path (doom--module-paths)) - (nconc targets - (cl-remove-if (lambda (file) - (let ((fname (file-name-nondirectory file))) - (or (string= fname ".") - (string= fname "..")))) - (reverse - (directory-files-recursively path "\\.el$")))))) + (dolist (path (doom--module-paths)) + (nconc targets + (cl-remove-if (lambda (file) + (let ((fname (file-name-nondirectory file))) + (or (string= fname ".") + (string= fname "..")))) + (reverse + (directory-files-recursively path "\\.el$"))))) (dolist (file targets) (push (cons (file-relative-name file doom-emacs-dir) (and (byte-recompile-file file nil 0)