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

2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c9f5b9f035..db559581ec2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-15  Chong Yidong  <cyd@gnu.org>
+
+        * server.el (server-process-filter): Handle corner case where both
+        tty and nowait options are present (Bug#11102).
+
 2012-04-15  Glenn Morris  <rgm@gnu.org>
 
         * simple.el (process-file-side-effects): Doc fix.
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