emacsclient: check WAYLAND_DISPLAY

lheckemann · lheckemann · commit 4fd0e8e06ea8 · 2020-03-22T22:41:09.000+01:00
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
@@ -611,7 +611,9 @@ decode_options (int argc, char **argv)
       alt_display = "w32";
 #endif
 
-      display = egetenv ("DISPLAY");
+      display = egetenv ("WAYLAND_DISPLAY");
+      if (!display)
+	display = egetenv ("DISPLAY");
     }
 
   if (!display)

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,9 @@ decode_options (int argc, char **argv)`
`611`	`611`	`alt_display = "w32";`
`612`	`612`	`#endif`
`613`	`613`
`614`		`- display = egetenv ("DISPLAY");`
	`614`	`+ display = egetenv ("WAYLAND_DISPLAY");`
	`615`	`+ if (!display)`
	`616`	`+ display = egetenv ("DISPLAY");`
`615`	`617`	`}`
`616`	`618`
`617`	`619`	`if (!display)`