(server-select-display): Nop if we do not support m-f-o-d.

(server-process-filter): Revert last change.

2 files changed, 8 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3259a58a839..555aa3ec85d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * server.el (server-select-display): Nop if we do not support m-f-o-d.
+        (server-process-filter): Revert last change.
+
         * vc.el (vc-diff-sentinel, vc-diff-internal): Revert some change in the
         behavior unrelated to filesets.
 
diff --git a/lisp/server.el b/lisp/server.el
index c66ff7cfdd6..70d2283b0eb 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -325,7 +325,10 @@ message."
 
 (defun server-select-display (display)
   ;; If the current frame is on `display' we're all set.
-  (unless (equal (frame-parameter (selected-frame) 'display) display)
+  ;; Similarly if we are unable to open a frames on other displays, there's
+  ;; nothing more we can do.
+  (unless (or (not (fboundp 'make-frame-on-display))
+              (equal (frame-parameter (selected-frame) 'display) display))
     ;; Otherwise, look for an existing frame there and select it.
     (dolist (frame (frame-list))
       (when (equal (frame-parameter frame 'display) display)
@@ -831,11 +834,7 @@ 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))
-                  ;; 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 display (match-string 1 request))
                   (setq request (substring request (match-end 0))))
 
                  ;; -window-system:  Open a new X frame.