diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-07-29 10:51:50 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-07-29 10:51:50 +0000 |
| commit | d7a0175d426200fb931fa5e5ded5b890726ecd23 (patch) | |
| tree | 920af91e374d8ad09a2a0469741a00004b0eb96a | |
| parent | 6f5d9ee789f8e2b239f8d521a29f8a15d2c59659 (diff) | |
| download | emacs-d7a0175d426200fb931fa5e5ded5b890726ecd23.tar.gz | |
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
| -rw-r--r-- | README.multi-tty | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/README.multi-tty b/README.multi-tty index 12bc2c2558c..96589099e20 100644 --- a/README.multi-tty +++ b/README.multi-tty @@ -42,6 +42,7 @@ Romain Francoise <romain@orebokech.com> Ami Fischman <ami@fischman.org> Noah Friedman <friedman@splode.com> Friedrich Delgado Friedrichs <friedel@nomaden.org> +Eric Hanchrow <offby1@blarg.net> IRIE Tetsuya <irie@t.email.ne.jp> Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> Bas Kok <nekkobassu@yahoo.com> @@ -406,6 +407,7 @@ THINGS TO DO ------------ ** See if `tty-defined-color-alist' needs to be terminal-local. + Dan says it should be, so convert it. ** emacsclient -t on the console does not work after su. You have to use non-root accounts or start as root to see this. 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." (run-hooks 'before-make-frame-hook) (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist))))) (normal-erase-is-backspace-setup-frame frame) - ;; Inherit the 'environment and 'client parameters, if needed. - (when (eq (frame-terminal frame) (frame-terminal oldframe)) - (let ((env (frame-parameter oldframe 'environment)) - (client (frame-parameter oldframe 'client))) - (if (not (framep env)) - (setq env oldframe)) - (if (and env (not (assq 'environment parameters))) - (set-frame-parameter frame 'environment env)) - (if (and client (not (assq 'client parameters))) - (set-frame-parameter frame 'client client)))) + ;; Inherit the 'environment and 'client parameters. + (let ((env (frame-parameter oldframe 'environment)) + (client (frame-parameter oldframe 'client))) + (if (not (framep env)) + (setq env oldframe)) + (if (and env (not (assq 'environment parameters))) + (set-frame-parameter frame 'environment env)) + (if (and client (not (assq 'client parameters))) + (set-frame-parameter frame 'client client))) (run-hook-with-args 'after-make-frame-functions frame) frame)) |