diff options
| author | Yuuki Harano | 2020-03-24 00:33:57 +0900 |
|---|---|---|
| committer | Jeff Walsh | 2020-11-24 12:24:31 +1100 |
| commit | d2a29e883e662a3f269628d5cbdf195c783ddf01 (patch) | |
| tree | 70f8166c1609d921645dc068db2a009899e7811d /lib-src | |
| parent | 806b7640c0fe757ee6c2213e33220a807a5aa05d (diff) | |
| download | emacs-d2a29e883e662a3f269628d5cbdf195c783ddf01.tar.gz emacs-d2a29e883e662a3f269628d5cbdf195c783ddf01.zip | |
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')
| -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) | |||
| 611 | alt_display = "w32"; | 611 | alt_display = "w32"; |
| 612 | #endif | 612 | #endif |
| 613 | 613 | ||
| 614 | #ifdef HAVE_PGTK | ||
| 615 | display = egetenv ("WAYLAND_DISPLAY"); | ||
| 616 | alt_display = egetenv ("DISPLAY"); | ||
| 617 | #else | ||
| 614 | display = egetenv ("DISPLAY"); | 618 | display = egetenv ("DISPLAY"); |
| 619 | #endif | ||
| 615 | } | 620 | } |
| 616 | 621 | ||
| 617 | if (!display) | 622 | if (!display) |