bug#65812: 29.1; Emacs client on Windows can't connect to the daemon on WSL over TCP

[Eli Zaretskii <eliz@gnu.org>]

> Cc: 65812@debbugs.gnu.org
> Date: Fri, 08 Sep 2023 14:18:45 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> 
> > Cc: 65812@debbugs.gnu.org
> > Date: Fri, 08 Sep 2023 10:24:25 +0300
> > From: Eli Zaretskii <eliz@gnu.org>
> > 
> > Please try the patch below and tell if it solves your problem.
> 
> Sorry, there was an error in that patch (this is what I get for
> sending patches in a hurry).  Please try the one below instead.

The OP used an email address that cannot be replied to.  Could someone
here who uses WSL (or some other setup where emacsclient on Windows
talks to the server on Unix) please try this patch with the recipe in

  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65812#5

and report back?

If no one can test this within a week or so, I'm going to install this
on the emacs-29 branch regardless.  TIA.

> diff --git a/lisp/server.el b/lisp/server.el
> index 104fc06..1006fee 100644
> --- a/lisp/server.el
> +++ b/lisp/server.el
> @@ -1262,9 +1262,12 @@ server-process-filter
>                   ;; 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
> 
> 
> 
>