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
This commit is contained in:
parent
806b7640c0
commit
d2a29e883e
2 changed files with 16 additions and 6 deletions
|
@ -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)
|
||||
|
|
|
@ -881,12 +881,17 @@ This handles splitting the command if it would be bigger than
|
|||
)
|
||||
|
||||
(cond (w
|
||||
(server--create-frame
|
||||
nowait proc
|
||||
`((display . ,display)
|
||||
,@(if parent-id
|
||||
`((parent-id . ,(string-to-number parent-id))))
|
||||
,@parameters)))
|
||||
(condition-case nil
|
||||
(server--create-frame
|
||||
nowait proc
|
||||
`((display . ,display)
|
||||
,@(if parent-id
|
||||
`((parent-id . ,(string-to-number parent-id))))
|
||||
,@parameters))
|
||||
(error
|
||||
(server-log "Window system unsupported" proc)
|
||||
(server-send-string proc "-window-system-unsupported \n")
|
||||
nil)))
|
||||
|
||||
(t
|
||||
(server-log "Window system unsupported" proc)
|
||||
|
|
Loading…
Add table
Reference in a new issue