[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/10/17 02:07:36

Index: server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- server.el   10 Oct 2007 20:43:22 -0000      1.144
+++ server.el   17 Oct 2007 02:07:35 -0000      1.145
@@ -831,8 +831,12 @@
                 ;; 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)