* lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912).

This commit is contained in:
Noam Postavsky 2017-06-04 23:54:51 -04:00
parent 2aa8b1564e
commit 24f011d56a

View file

@ -733,6 +733,10 @@ if different)."
(condition-case err
(unless (or (eq frame this)
(eq frame mini)
;; Don't delete daemon's initial frame, or
;; we'll never be able to close the last
;; client's frame (Bug#26912).
(if (daemonp) (not (frame-parameter frame 'client)))
(frame-parameter frame 'desktop-dont-clear))
(delete-frame frame))
(error