Remove unnused letvar doom--inhibit-reload
This commit is contained in:
parent
bd5ecc1aca
commit
debe3e0dd3
3 changed files with 18 additions and 21 deletions
|
@ -18,24 +18,23 @@ If called from an interactive session, tries to reload autoloads files (if
|
|||
necessary), reinistalize doom (via `doom-initialize') and reloads your private
|
||||
init.el and config.el. Then runs `doom-reload-hook'."
|
||||
(interactive)
|
||||
(unless doom--inhibit-reload
|
||||
(cond ((and noninteractive (not (daemonp)))
|
||||
(require 'server)
|
||||
(if (not (server-running-p))
|
||||
(doom//reload-autoloads force-p)
|
||||
(print! "Reloading active Emacs session...")
|
||||
(print!
|
||||
(bold "%%s")
|
||||
(if (server-eval-at server-name '(doom//reload))
|
||||
(green "Done!")
|
||||
(red "There were issues!")))))
|
||||
((let ((load-prefer-newer t))
|
||||
(cond ((and noninteractive (not (daemonp)))
|
||||
(require 'server)
|
||||
(if (not (server-running-p))
|
||||
(doom//reload-autoloads force-p)
|
||||
(doom-initialize t)
|
||||
(doom-initialize-modules t)
|
||||
(print! (green "%d packages reloaded" (length package-alist)))
|
||||
(run-hooks 'doom-reload-hook)
|
||||
t)))))
|
||||
(print! "Reloading active Emacs session...")
|
||||
(print!
|
||||
(bold "%%s")
|
||||
(if (server-eval-at server-name '(doom//reload))
|
||||
(green "Done!")
|
||||
(red "There were issues!")))))
|
||||
((let ((load-prefer-newer t))
|
||||
(doom//reload-autoloads force-p)
|
||||
(doom-initialize t)
|
||||
(ignore-errors (doom-initialize-modules t))
|
||||
(print! (green "%d packages reloaded" (length package-alist)))
|
||||
(run-hooks 'doom-reload-hook)
|
||||
t))))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
@ -198,9 +198,8 @@ recompile. Run this whenever you:
|
|||
4. Update Doom outside of Doom (e.g. with git)"
|
||||
(doom//reload-doom-autoloads)
|
||||
(unwind-protect
|
||||
(let ((doom--inhibit-reload t))
|
||||
(doom//packages-autoremove)
|
||||
(doom//packages-install))
|
||||
(progn (doom//packages-autoremove)
|
||||
(doom//packages-install))
|
||||
(doom//reload-package-autoloads)
|
||||
(doom//byte-compile nil 'recompile)))
|
||||
|
||||
|
|
|
@ -88,7 +88,6 @@ file.")
|
|||
(defvar doom--current-module nil)
|
||||
(defvar doom--refreshed-p nil)
|
||||
(defvar doom--stage 'init)
|
||||
(defvar doom--inhibit-reload nil)
|
||||
|
||||
;;
|
||||
(setq autoload-compute-prefixes nil
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue