Merge from emacs-24 branch

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index c82a639eadf121e80ee02d4d6264a72e183ab8e7..123fea3743ac1c896da81b5aabc072f0031de843 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1174,6 +1174,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