diff options
| author | Michael Shields | 2019-06-25 13:57:58 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-06-25 14:53:51 +0200 |
| commit | 14fc8a108ba19c8d773df6de42f413be551c3025 (patch) | |
| tree | 420588a56d955a1df79353430b9d774e16a2359e | |
| parent | 0d51f542361752651f3424f539e3edd24ec6a4cc (diff) | |
| download | emacs-14fc8a108ba19c8d773df6de42f413be551c3025.tar.gz emacs-14fc8a108ba19c8d773df6de42f413be551c3025.zip | |
[PATCH 1/1] Pass frame-parameters to server-create-tty-frame
* lisp/server.el: Pass frame-parameters when creating frames, even
on a tty (bug#24147).
| -rw-r--r-- | lisp/server.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 436a44a7e94..3435702a651 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -833,7 +833,7 @@ This handles splitting the command if it would be bigger than | |||
| 833 | (setq prefix "-print-nonl ")) | 833 | (setq prefix "-print-nonl ")) |
| 834 | (server-send-string proc (concat prefix qtext "\n")))) | 834 | (server-send-string proc (concat prefix qtext "\n")))) |
| 835 | 835 | ||
| 836 | (defun server-create-tty-frame (tty type proc) | 836 | (defun server-create-tty-frame (tty type proc &optional parameters) |
| 837 | (unless tty | 837 | (unless tty |
| 838 | (error "Invalid terminal device")) | 838 | (error "Invalid terminal device")) |
| 839 | (unless type | 839 | (unless type |
| @@ -866,7 +866,8 @@ This handles splitting the command if it would be bigger than | |||
| 866 | ;; envvars, and then to change the | 866 | ;; envvars, and then to change the |
| 867 | ;; C functions `child_setup' and | 867 | ;; C functions `child_setup' and |
| 868 | ;; `getenv_internal' accordingly. | 868 | ;; `getenv_internal' accordingly. |
| 869 | (environment . ,(process-get proc 'env))))))) | 869 | (environment . ,(process-get proc 'env)) |
| 870 | ,@parameters))))) | ||
| 870 | 871 | ||
| 871 | ;; ttys don't use the `display' parameter, but callproc.c does to set | 872 | ;; ttys don't use the `display' parameter, but callproc.c does to set |
| 872 | ;; the DISPLAY environment on subprocesses. | 873 | ;; the DISPLAY environment on subprocesses. |