TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for persistent-server if server never got started

This commit is contained in:
Rich Alesi 2015-03-25 23:05:40 -07:00 committed by syl20bnr
parent cd43db1caa
commit f71eec61d0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spacemacs/funcs.el
View File

@ -547,11 +547,18 @@ kill internal buffers too."
(defvar spacemacs-really-kill-emacs nil
"prevent window manager close from closing instance.")
(defun spacemacs-persistent-server-running-p ()
"requires spacemacs-really-kill-emacs to be toggled and dotspacemacs-persistent-server to be t"
(and (fboundp 'server-running-p)
(server-running-p)
dotspacemacs-persistent-server))
(defadvice kill-emacs (around spacemacs-really-exit activate)
"Only kill emacs if a prefix is set"
(if (or spacemacs-really-kill-emacs (not dotspacemacs-persistent-server))
ad-do-it
(spacemacs/frame-killer)))
(if (and (not spacemacs-really-kill-emacs) (spacemacs-persistent-server-running-p))
(spacemacs/frame-killer)
ad-do-it
))
(defadvice save-buffers-kill-emacs (around spacemacs-really-exit activate)
"Only kill emacs if a prefix is set"