[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 24f011d: * lisp/desktop.el (desktop-clear): Skip th
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master 24f011d: * lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912). |
Date: |
Mon, 5 Jun 2017 00:32:08 -0400 (EDT) |
branch: master
commit 24f011d56aec273847181f9befbad491deb2f67e
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
* lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912).
---
lisp/desktop.el | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 39dc92f..540d0e3 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 24f011d: * lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912).,
Noam Postavsky <=