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

Move "emacsclient -t -n" handling from emacsclient.c to server.el.

Browse source 
Fix its buggy logic for the Windows case (regression from 23.4).

* lib-src/emacsclient.c (decode_options): Move -t -n corner case handling
into server.el.

* lisp/server.el (server-process-filter): Handle corner case where both
tty and nowait options are present.

Fixes: debbugs:11102
This commit is contained in:
Chong Yidong 2012-04-15 16:49:24 +08:00
parent 467a33d09f
commit 9a864fa27d
4 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/server.el
View file

@ -1133,6 +1133,13 @@ The following commands are accepted by the client:
;; Unknown command.
(arg (error "Unknown command: %s" arg))))
;; If both -no-wait and -tty are given with file or sexp
;; arguments, use an existing frame.
(and nowait
(not (eq tty-name 'window-system))
(or files commands)
(setq use-current-frame t))
(setq frame
(cond
((and use-current-frame