From 22d1969a52d52442020c1b8289179df62cde2dc3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 30 Mar 2017 15:15:26 -0400 Subject: [PATCH] doom/reload: recompile + reload compiled el files; silence byte compile --- core/core-packages.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index ce1d84d32..d0f4360d8 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -254,7 +254,7 @@ Used by `require!' and `depends-on!'." (defun doom--display-benchmark () (message "Loaded %s packages in %.03fs" - (length doom--package-load-path) + (eval-when-compile (length doom--package-load-path)) (setq doom-init-time (float-time (time-subtract after-init-time before-init-time))))) @@ -379,10 +379,12 @@ server, if necessary) by `doom/packages-install', `doom/packages-update' and `doom/packages-autoremove'. " (interactive) (if noninteractive - (ignore-errors + (progn + (message "Reloading...") (require 'server) - (unless (server-eval-at "server" '(doom/reload)) - (message "No active emacs session running to reload"))) + (unless (ignore-errors (server-eval-at "server" '(doom/reload))) + (message "Recompiling") + (doom/recompile))) (doom-initialize t) (doom/recompile) (message "Reloaded %d packages" (length doom--package-load-path)))) @@ -484,8 +486,10 @@ take a while." (reverse (directory-files-recursively doom-core-dir "\\.el$")) (reverse (directory-files-recursively doom-modules-dir "\\.el$")))))) (dolist (file targets) - (when (byte-compile-file file) + (when (quiet! (byte-compile-file file)) (message "+ Recompiling %s" file) + (when (assoc (file-truename file) load-history) + (ignore-errors (load file nil t))) (cl-incf n))) (if (= (length targets) 0) (message "Nothing to recompile")