Refactor doom/reload

This commit is contained in:
Henrik Lissner 2017-06-03 21:00:53 +02:00
parent 94227bbb79
commit 77e2a1f6f2

View file

@ -394,19 +394,17 @@ modify/update packages outside of emacs. Automatically called (through the
server, if necessary) by `doom/packages-install', `doom/packages-update' and server, if necessary) by `doom/packages-install', `doom/packages-update' and
`doom/packages-autoremove'. " `doom/packages-autoremove'. "
(interactive) (interactive)
(if noninteractive (cond (noninteractive
(progn
(message "Reloading...") (message "Reloading...")
(require 'server) (require 'server)
(unless (ignore-errors (server-eval-at "server" '(doom/reload t))) (unless (ignore-errors (server-eval-at "server" '(doom/reload t)))
(message "Recompiling") (message "Recompiling")
(doom/recompile))) (doom/recompile)))
(if ignorable-p (t
(message "Ignored a reload request from server")
(doom-initialize t) (doom-initialize t)
(doom/recompile) (doom/recompile)
(message "Reloaded %d packages" (length doom--package-load-path)) (message "Reloaded %d packages" (length doom--package-load-path))
(run-with-timer 1 nil #'redraw-frame) (run-with-timer 1 nil #'redraw-display)
(run-hooks 'doom-reload-hook)))) (run-hooks 'doom-reload-hook))))
(defun doom/reload-autoloads () (defun doom/reload-autoloads ()