From 77e2a1f6f2316bb072cc35e919412629d1775069 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 3 Jun 2017 21:00:53 +0200 Subject: [PATCH] Refactor doom/reload --- core/core-packages.el | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index f2108abef..be05ce8e3 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -394,20 +394,18 @@ modify/update packages outside of emacs. Automatically called (through the server, if necessary) by `doom/packages-install', `doom/packages-update' and `doom/packages-autoremove'. " (interactive) - (if noninteractive - (progn - (message "Reloading...") - (require 'server) - (unless (ignore-errors (server-eval-at "server" '(doom/reload t))) - (message "Recompiling") - (doom/recompile))) - (if ignorable-p - (message "Ignored a reload request from server") - (doom-initialize t) - (doom/recompile) - (message "Reloaded %d packages" (length doom--package-load-path)) - (run-with-timer 1 nil #'redraw-frame) - (run-hooks 'doom-reload-hook)))) + (cond (noninteractive + (message "Reloading...") + (require 'server) + (unless (ignore-errors (server-eval-at "server" '(doom/reload t))) + (message "Recompiling") + (doom/recompile))) + (t + (doom-initialize t) + (doom/recompile) + (message "Reloaded %d packages" (length doom--package-load-path)) + (run-with-timer 1 nil #'redraw-display) + (run-hooks 'doom-reload-hook)))) (defun doom/reload-autoloads () "Refreshes the autoloads.el file, which tells Emacs where to find all the