diff options
| author | Karoly Lorentey | 2006-07-29 10:51:50 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-07-29 10:51:50 +0000 |
| commit | d7a0175d426200fb931fa5e5ded5b890726ecd23 (patch) | |
| tree | 920af91e374d8ad09a2a0469741a00004b0eb96a /lisp | |
| parent | 6f5d9ee789f8e2b239f8d521a29f8a15d2c59659 (diff) | |
| download | emacs-d7a0175d426200fb931fa5e5ded5b890726ecd23.tar.gz emacs-d7a0175d426200fb931fa5e5ded5b890726ecd23.zip | |
Let frames on new terminals inherit 'environment and 'client.
* lisp/frame.el (make-frame): Always inherit 'environment and 'client
parameters.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-575
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index ff07999f804..e965007c8b0 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -698,16 +698,15 @@ setup is for focus to follow the pointer." | |||
| 698 | (run-hooks 'before-make-frame-hook) | 698 | (run-hooks 'before-make-frame-hook) |
| 699 | (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist))))) | 699 | (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist))))) |
| 700 | (normal-erase-is-backspace-setup-frame frame) | 700 | (normal-erase-is-backspace-setup-frame frame) |
| 701 | ;; Inherit the 'environment and 'client parameters, if needed. | 701 | ;; Inherit the 'environment and 'client parameters. |
| 702 | (when (eq (frame-terminal frame) (frame-terminal oldframe)) | 702 | (let ((env (frame-parameter oldframe 'environment)) |
| 703 | (let ((env (frame-parameter oldframe 'environment)) | 703 | (client (frame-parameter oldframe 'client))) |
| 704 | (client (frame-parameter oldframe 'client))) | 704 | (if (not (framep env)) |
| 705 | (if (not (framep env)) | 705 | (setq env oldframe)) |
| 706 | (setq env oldframe)) | 706 | (if (and env (not (assq 'environment parameters))) |
| 707 | (if (and env (not (assq 'environment parameters))) | 707 | (set-frame-parameter frame 'environment env)) |
| 708 | (set-frame-parameter frame 'environment env)) | 708 | (if (and client (not (assq 'client parameters))) |
| 709 | (if (and client (not (assq 'client parameters))) | 709 | (set-frame-parameter frame 'client client))) |
| 710 | (set-frame-parameter frame 'client client)))) | ||
| 711 | (run-hook-with-args 'after-make-frame-functions frame) | 710 | (run-hook-with-args 'after-make-frame-functions frame) |
| 712 | frame)) | 711 | frame)) |
| 713 | 712 | ||