bug#54844: 29.0.50; pgtk: with --daemon, DISPLAY gets set to "wayland-0"

[Po Lu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>]

Sean Whitton <spwhitton@spwhitton.name> writes:

> Thank you for the patch, but unfortunately I can still reproduce the
> problem using my original recipe.

I missed something, sorry, what if you apply this in addition to the
other patch?

diff --git a/src/callproc.c b/src/callproc.c
index 0922e10f01..df673311d6 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1687,6 +1687,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value,
   /* For DISPLAY try to get the values from the frame or the initial env.  */
   if (strcmp (var, "DISPLAY") == 0)
     {
+#ifndef HAVE_PGTK
       Lisp_Object display
 	= Fframe_parameter (NILP (frame) ? selected_frame : frame, Qdisplay);
       if (STRINGP (display))
@@ -1695,6 +1696,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value,
 	  *valuelen = SBYTES (display);
 	  return 1;
 	}
+#endif
       /* If still not found, Look for DISPLAY in Vinitial_environment.  */
       if (getenv_internal_1 (var, varlen, value, valuelen,
 			     Vinitial_environment))

Thanks.