Mercurial > emacs
changeset 85365:a10ee3a5c9ce
(server-select-display): Nop if we do not support m-f-o-d.
(server-process-filter): Revert last change.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 17 Oct 2007 16:22:48 +0000 |
| parents | f8d1bb788744 |
| children | e8f9d460bc3e |
| files | lisp/ChangeLog lisp/server.el |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 17 16:22:27 2007 +0000 +++ b/lisp/ChangeLog Wed Oct 17 16:22:48 2007 +0000 @@ -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.
--- a/lisp/server.el Wed Oct 17 16:22:27 2007 +0000 +++ b/lisp/server.el Wed Oct 17 16:22:48 2007 +0000 @@ -325,7 +325,10 @@ (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 @@ ;; 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.