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

Don't reload autoloads remotely

Browse source 
Communicating with the Emacs server isn't reliable and has a tendency to
hang, so we no longer do that. Instead, we inform the user to reload it
themselves.
This commit is contained in:
Henrik Lissner 2018-07-12 19:51:21 +02:00
parent e5125fbb26
commit 54c7936a77
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/core-cli.el
View file

@ -337,20 +337,16 @@ it exists."
(when (funcall fn doom-auto-accept) (when (funcall fn doom-auto-accept)
(doom-reload-package-autoloads))) (doom-reload-package-autoloads)))
(defun doom--server-reload-autoloads () (defun doom--warn-refresh-session ()
(message "Reloading your current Emacs session\n") (message "Detected a running Emacs session.\n")
(message "If this hangs, it is safe to abort the process here") (message "Use `M-x doom/reload' for changes to take effect."))
(server-eval-at
server-name
`(dolist (file '(,doom-autoload-file ,doom-package-autoload-file))
(load-file (byte-compile-dest-file file)))))
(defun doom--server-load (&rest files) (defun doom--do-load (&rest files)
(if (and noninteractive (not (daemonp))) (if (and noninteractive (not (daemonp)))
(progn (progn
(require 'server) (require 'server)
(when (server-running-p) (when (server-running-p)
(add-hook 'kill-emacs-hook #'doom--server-reload-autoloads))) (add-hook 'kill-emacs-hook #'doom--warn-refresh-session)))
(dolist (file files) (dolist (file files)
(load-file (byte-compile-dest-file file))))) (load-file (byte-compile-dest-file file)))))
@ -592,7 +588,7 @@ modified."
(print! (green "✓ Clean up autoloads"))) (print! (green "✓ Clean up autoloads")))
;; Byte compile it to give the file a chance to reveal errors. ;; Byte compile it to give the file a chance to reveal errors.
(doom--byte-compile-file doom-autoload-file) (doom--byte-compile-file doom-autoload-file)
(doom--server-load doom-autoload-file) (doom--do-load doom-autoload-file)
t))) t)))
@ -667,7 +663,7 @@ This should be run whenever your `doom!' block or update your packages."
(doom--cleanup-package-autoloads) (doom--cleanup-package-autoloads)
(print! (green "✓ Removed load-path/auto-mode-alist entries")))) (print! (green "✓ Removed load-path/auto-mode-alist entries"))))
(doom--byte-compile-file doom-package-autoload-file) (doom--byte-compile-file doom-package-autoload-file)
(doom--server-load doom-package-autoload-file) (doom--do-load doom-package-autoload-file)
t)) t))