[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b16b4d7 2/2: If the daemon’s TTY is our only frame, create a new
From: |
Lars Ingebrigtsen |
Subject: |
master b16b4d7 2/2: If the daemon’s TTY is our only frame, create a new frame |
Date: |
Tue, 22 Jun 2021 09:21:43 -0400 (EDT) |
branch: master
commit b16b4d730e0535484393aa8c01744fc609e61d92
Author: Peter Oliver <git@mavit.org.uk>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
If the daemon’s TTY is our only frame, create a new frame
* server.el (server-process-filter): If there won't be a current frame
to use, fall back to trying to create a new one (bug#11033).
---
lisp/server.el | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/lisp/server.el b/lisp/server.el
index 3205ba1..ac5db19 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1308,7 +1308,17 @@ The following commands are accepted by the client:
frame-parameters))
;; When resuming on a tty, tty-name is nil.
(tty-name
- (server-create-tty-frame tty-name tty-type proc))))
+ (server-create-tty-frame tty-name tty-type proc))
+
+ ;; If there won't be a current frame to use, fall
+ ;; back to trying to create a new one.
+ ((and use-current-frame
+ (daemonp)
+ (null (cdr (frame-list)))
+ (eq (selected-frame) terminal-frame)
+ display)
+ (setq tty-name nil tty-type nil)
+ (server-select-display display))))
(process-put
proc 'continuation