mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Fix frame parameter handling in server.el.

Browse source 
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
This commit is contained in:
Karoly Lorentey 2004-04-18 02:24:18 +00:00
parent f2e45864d1
commit 540216761e
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/server.el
View file

@ -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))