From 738d8543337ee01eaa889f26da473dc84f652b8a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 15 Sep 2023 10:02:00 +0300 Subject: [PATCH] Support emacsclient on Windows with server on GNU or Unix systems * lisp/server.el (server-process-filter): If 'tty-name' is literally "CONOUT$", assume the client runs on MS-Windows and force the frame type to GUI. This allows to run emacsclient on MS-Windows when the server runs on a Posix host. (Bug#65812) --- lisp/server.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 104fc060c05..1006fee5c4c 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1262,9 +1262,12 @@ The following commands are accepted by the client: ;; choice there.) In daemon mode on Windows, we can't ;; make tty frames, so force the frame type to GUI ;; there too. - (when (and (eq system-type 'windows-nt) - (or (daemonp) - (eq window-system 'w32))) + (when (or (and (eq system-type 'windows-nt) + (or (daemonp) + (eq window-system 'w32))) + ;; Client runs on Windows, but the server + ;; runs on a Posix host. + (equal tty-name "CONOUT$")) (push "-window-system" args-left))) ;; -position +LINE[:COLUMN]: Set point to the given -- 2.39.2