diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2020-03-24 00:33:57 +0900 |
|---|---|---|
| committer | Jeff Walsh <jeff.walsh@drtusers-MacBook-Pro.local> | 2020-11-24 12:24:31 +1100 |
| commit | d2a29e883e662a3f269628d5cbdf195c783ddf01 (patch) | |
| tree | 70f8166c1609d921645dc068db2a009899e7811d /lib-src/emacsclient.c | |
| parent | 806b7640c0fe757ee6c2213e33220a807a5aa05d (diff) | |
| download | emacs-d2a29e883e662a3f269628d5cbdf195c783ddf01.tar.gz | |
emacsclient should use both of DISPLAY and WAYLAND_DISPLAY.
* lisp/server.el (server-create-window-system-frame): error out when
not on a supported window
* lib-src/emacsclient.c (decode_options): handle WALAND_DISPLAY on PGTK
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 871fa7a8d3c..a55e4bc705c 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -611,7 +611,12 @@ decode_options (int argc, char **argv) alt_display = "w32"; #endif +#ifdef HAVE_PGTK + display = egetenv ("WAYLAND_DISPLAY"); + alt_display = egetenv ("DISPLAY"); +#else display = egetenv ("DISPLAY"); +#endif } if (!display) |