Desktop: Ensure server.el is loaded before testing if it's running

master
Pierre Neidhardt 2019-04-26 10:02:02 +02:00
parent be9661b170
commit ef8e90b5b6
1 changed files with 2 additions and 1 deletions

View File

@ -257,7 +257,8 @@
;;; and https://stackoverflow.com/questions/5830494/windows-configuration-to-registers#5830928
;;; and https://www.reddit.com/r/emacs/comments/7au3hj/how_do_you_manage_your_emacs_windows_and_stay_sane/dpfbg3a/?context=3.
(defun ambrevar/desktop-setup (&rest _ignored)
(when (and (server-running-p)
(when (and (fboundp 'server-running-p)
(server-running-p)
(or (not (boundp 'desktop-save-mode))
(null desktop-save-mode)))
(when (< emacs-major-version 27)