Don't ignore emacsclient's --frame-parameters option when -t

* lisp/server.el (server-process-filter): Add part of patch that
was mistakenly missed when the patch was applied (bug#24147).
This also fixes bug#56309.

diff --git a/lisp/server.el b/lisp/server.el
index 8f47a99a31a6881238a767731621fda7f5ca0d91..229942c19acf62f04cea16447d9049fce72548eb 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1314,7 +1314,8 @@ The following commands are accepted by the client:
                                                       frame-parameters))
                   ;; When resuming on a tty, tty-name is nil.
                   (tty-name
-                   (server-create-tty-frame tty-name tty-type proc))
+                   (server-create-tty-frame tty-name tty-type proc
+                                             frame-parameters))))
 
                    ;; If there won't be a current frame to use, fall
                    ;; back to trying to create a new one.