Commit 54021676 authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Fix frame parameter handling in server.el.

lisp/server.el (server-process-filter): Work around make-frame
frame parameter bogosity by using modify-frame-parameters.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-145
parent f2e45864
......@@ -187,6 +187,17 @@ See arch logs.
THINGS TO DO
------------
** frame-creation-function was removed, which might be a bad idea.
Think up a compatible solution.
** make-frame does not correctly handle extra parameters in its
argument:
(frame-parameter (make-frame (list (cons 'foobar 42))) 'foobar)
=> nil
(This is likely an error in the CVS trunk.)
** Fix set-input-mode for multi-tty. It's a truly horrible interface;
what if we'd blow it up into several separate functions (with a
compatibility definition)?
......
......@@ -468,8 +468,8 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
(or display
(frame-parameter nil 'display)
(getenv "DISPLAY")
(error "Please specify display"))
(list (cons 'client proc))))
(error "Please specify display"))))
(modify-frame-parameters frame (list (cons 'client proc)))
(select-frame frame)
(server-client-set client 'frame frame)
(setq dontkill t))
......@@ -501,7 +501,8 @@ PROC is the server process. Format of STRING is \"PATH PATH PATH... \\n\"."
(setq request (substring request (match-end 0)))
(unless (server-client-get client 'version)
(error "Protocol error; make sure you use the correct version of emacsclient"))
(setq frame (make-frame-on-tty tty type (list (cons 'client proc))))
(setq frame (make-frame-on-tty tty type))
(modify-frame-parameters frame (list (cons 'client proc)))
(select-frame frame)
(server-client-set client 'frame frame)
(server-client-set client 'tty (frame-tty-name 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