emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bin/doom hanging after generating autoloads

Browse source 
Emacs occasionally hangs when polling for the emacs server (with
server-running-p). Since this is used for such a trivial feature (to
decide whether or not to display the "you need to restart" message), I
removed it. Now it always shows that message (if the autoload files have
changed).
This commit is contained in:
Henrik Lissner 2018-10-19 12:07:17 -04:00
parent 09603c5444
commit 847983e278
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/cli/autoloads.el
View file

@ -34,15 +34,17 @@ it exists."
(message "Deleted old %s" (file-name-nondirectory file))))
(defun doom--warn-refresh-session ()
(message "Detected a running Emacs session.\n")
(message "Restart Emacs or use `M-x doom/reload' for changes to take effect."))
(print! (bold (green "\nFinished!")))
(message "If you have a running Emacs Session, you will need to restart it or")
(message "reload Doom for changes to take effect:\n")
(when (fboundp '+workspace/restart-emacs-then-restore)
(message " M-x +workspace/restart-emacs-then-restore"))
(message " M-x restart-emacs")
(message " M-x doom/reload"))
(defun doom--do-load (&rest files)
(if (and noninteractive (not (daemonp)))
(progn
(require 'server)
(when (server-running-p)
(add-hook 'kill-emacs-hook #'doom--warn-refresh-session)))
(add-hook 'kill-emacs-hook #'doom--warn-refresh-session)
(dolist (file files)
(load-file (byte-compile-dest-file file)))))