Commit 8a3a4fd3 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

(server-process-filter): Only set display if X11 is

parent c49847b9
2007-10-17 Dan Nicolaescu <>
* server.el (server-process-filter): Only set display if X11 is
2007-10-17 Glenn Morris <>
* progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Tweak
......@@ -831,8 +831,12 @@ The following commands are accepted by the client:
;; Open X frames on the given display instead of the default.
((and (equal "-display" arg)
(string-match "\\([^ ]*\\) " request))
(setq display (match-string 1 request)
request (substring request (match-end 0))))
;; Only set `display' if X is supported.
;; Emacsclient cannot know if emacs supports X and
;; it will send -display anyway.
(when (memq 'x frame-creation-function-alist)
(setq display (match-string 1 request)))
(setq request (substring request (match-end 0))))
;; -window-system: Open a new X frame.
((equal "-window-system" arg)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment