summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shields <shields@msrl.com>2022-06-30 12:10:45 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2022-06-30 12:10:45 +0200
commit3933ece030150908c9189c11cf683bb3df9e4e18 (patch)
tree2c7f57b814be39bf09b6585f2b9662579ee237d3
parent7b9d755b816ca697b879b7c5c61526f96e9f4b9a (diff)
downloademacs-3933ece030150908c9189c11cf683bb3df9e4e18.tar.gz
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.
-rw-r--r--lisp/server.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el
index 8f47a99a31a..229942c19ac 100644
--- 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.