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

supported.

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ea970016ba..6a9fabe4153 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-17  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * server.el (server-process-filter): Only set display if X11 is
+        supported.
+
 2007-10-17  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Tweak
diff --git a/lisp/server.el b/lisp/server.el
index 22b947ea9f8..7d7b001b33f 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -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)