diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-15 16:49:24 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-15 16:49:24 +0800 |
| commit | 9a864fa27d1bdc85c3542d34e6a2fc02fe03c718 (patch) | |
| tree | dae3f52efe9b0d03a5ccf974b4bd5c22f075ba4a /lisp/server.el | |
| parent | 467a33d09f0e6d445fb020013ac65b12adffc35e (diff) | |
| download | emacs-9a864fa27d1bdc85c3542d34e6a2fc02fe03c718.tar.gz | |
Move "emacsclient -t -n" handling from emacsclient.c to server.el.
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
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/server.el b/lisp/server.el index 404bebc4747..ced07714dcf 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -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 |