Commit 1a4a884c authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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

(server-process-filter): Revert last change.
parent 17f3909f
2007-10-17 Stefan Monnier <monnier@iro.umontreal.ca> 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 * vc.el (vc-diff-sentinel, vc-diff-internal): Revert some change in the
behavior unrelated to filesets. behavior unrelated to filesets.
......
...@@ -325,7 +325,10 @@ message." ...@@ -325,7 +325,10 @@ message."
(defun server-select-display (display) (defun server-select-display (display)
;; If the current frame is on `display' we're all set. ;; 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. ;; Otherwise, look for an existing frame there and select it.
(dolist (frame (frame-list)) (dolist (frame (frame-list))
(when (equal (frame-parameter frame 'display) display) (when (equal (frame-parameter frame 'display) display)
...@@ -831,11 +834,7 @@ The following commands are accepted by the client: ...@@ -831,11 +834,7 @@ The following commands are accepted by the client:
;; Open X frames on the given display instead of the default. ;; Open X frames on the given display instead of the default.
((and (equal "-display" arg) ((and (equal "-display" arg)
(string-match "\\([^ ]*\\) " request)) (string-match "\\([^ ]*\\) " request))
;; Only set `display' if X is supported. (setq display (match-string 1 request))
;; 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)))) (setq request (substring request (match-end 0))))
;; -window-system: Open a new X frame. ;; -window-system: Open a new X frame.
......
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