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

Fix some issues with persistent server

Browse source 
* frame killer logic wasn't correct when server not running
* even when debugging, we want to kill spacemacs
This commit is contained in:
ralesi 2016-12-08 20:40:52 -07:00 committed by Eivind Fonn
parent ea54e6863e
commit a518d14c69
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
layers/+distributions/spacemacs-base/funcs.el
View file

@ -663,9 +663,10 @@ dotspacemacs-persistent-server to be t"
(defadvice save-buffers-kill-emacs (around spacemacs-really-exit activate) (defadvice save-buffers-kill-emacs (around spacemacs-really-exit activate)
"Only kill emacs if a prefix is set" "Only kill emacs if a prefix is set"
(if (or spacemacs-really-kill-emacs (not dotspacemacs-persistent-server)) (if (and (not spacemacs-really-kill-emacs)
ad-do-it (spacemacs//persistent-server-running-p))
(spacemacs/frame-killer))) (spacemacs/frame-killer)
ad-do-it))
(defun spacemacs/save-buffers-kill-emacs () (defun spacemacs/save-buffers-kill-emacs ()
"Save all changed buffers and exit Spacemacs" "Save all changed buffers and exit Spacemacs"
@ -689,10 +690,10 @@ dotspacemacs-persistent-server to be t"
(defun spacemacs/frame-killer () (defun spacemacs/frame-killer ()
"Kill server buffer and hide the main Emacs window" "Kill server buffer and hide the main Emacs window"
(interactive) (interactive)
(condition-case-unless-debug nil (condition-case nil
(delete-frame nil 1) (delete-frame nil 1)
(error (error
(make-frame-invisible nil 1)))) (make-frame-invisible nil 1))))
(defun spacemacs/toggle-frame-fullscreen () (defun spacemacs/toggle-frame-fullscreen ()
"Respect the `dotspacemacs-fullscreen-use-non-native' variable when "Respect the `dotspacemacs-fullscreen-use-non-native' variable when