From f71eec61d03c4dbeedd2af8a93513835ef080b8c Mon Sep 17 00:00:00 2001 From: Rich Alesi Date: Wed, 25 Mar 2015 23:05:40 -0700 Subject: [PATCH] Fix for persistent-server if server never got started --- spacemacs/funcs.el | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spacemacs/funcs.el b/spacemacs/funcs.el index b0caa45f4..a49c62426 100644 --- a/spacemacs/funcs.el +++ b/spacemacs/funcs.el @@ -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"