From: Noam Postavsky <npostavs@gmail.com>
Date: Mon, 5 Jun 2017 03:54:51 +0000 (-0400)
Subject: * lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912).
X-Git-Tag: emacs-26.0.90~521^2~170^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24f011d56aec273847181f9befbad491deb2f67e;p=emacs.git

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

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 39dc92fabe2..540d0e3b11d 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -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