Fix doom//reload-load-path infinite recursion with daemon emacs

This commit is contained in:
Henrik Lissner 2018-02-08 02:15:41 -05:00
parent f35a49dc7e
commit 3355378480
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -522,10 +522,10 @@ happen if you manually modify/update/install packages from outside Emacs, while
an Emacs session is running. an Emacs session is running.
This isn't necessary if you use Doom's package management commands because they This isn't necessary if you use Doom's package management commands because they
call `doom/reload-load-path' remotely (through emacsclient)." call `doom//reload-load-path' remotely (through emacsclient)."
(interactive) (interactive)
(byte-recompile-file (expand-file-name "core.el" doom-core-dir) t) (byte-recompile-file (expand-file-name "core.el" doom-core-dir) t)
(cond (noninteractive (cond ((and noninteractive (not (daemonp)))
(require 'server) (require 'server)
(when (server-running-p) (when (server-running-p)
(message "Reloading active Emacs session...") (message "Reloading active Emacs session...")