Mercurial > emacs
changeset 84752:b81c5052c6af
Don't set display-environment-variable.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 21 Sep 2007 07:23:04 +0000 |
| parents | bf9d24dbf5a9 |
| children | eceecc897cab |
| files | lisp/ChangeLog lisp/faces.el lisp/frame.el |
| diffstat | 3 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 21 07:21:41 2007 +0000 +++ b/lisp/ChangeLog Fri Sep 21 07:23:04 2007 +0000 @@ -1,3 +1,9 @@ +2007-09-21 Stefan Monnier <monnier@iro.umontreal.ca> + + * frame.el (frame-initialize, make-frame): + * faces.el (tty-set-up-initial-frame-faces): + * env.el (setenv): Don't set display-environment-variable. + 2007-09-21 Glenn Morris <rgm@gnu.org> * emacs-lisp/bytecomp.el (byte-compile-warnings)
--- a/lisp/faces.el Fri Sep 21 07:21:41 2007 +0000 +++ b/lisp/faces.el Fri Sep 21 07:23:04 2007 +0000 @@ -1935,9 +1935,7 @@ (defun tty-set-up-initial-frame-faces () (let ((frame (selected-frame))) (frame-set-background-mode frame) - (face-set-after-frame-default frame) - (set-frame-parameter frame-initial-frame 'display-environment-variable - (getenv "DISPLAY")))) + (face-set-after-frame-default frame)))
--- a/lisp/frame.el Fri Sep 21 07:21:41 2007 +0000 +++ b/lisp/frame.el Fri Sep 21 07:23:04 2007 +0000 @@ -240,8 +240,6 @@ ;; Copy the environment of the Emacs process into the new frame. (set-frame-parameter frame-initial-frame 'environment (frame-parameter terminal-frame 'environment)) - (set-frame-parameter frame-initial-frame 'display-environment-variable - (getenv "DISPLAY")) ;; At this point, we know that we have a frame open, so we ;; can delete the terminal frame. (delete-frame terminal-frame) @@ -727,14 +725,11 @@ (normal-erase-is-backspace-setup-frame frame) ;; Inherit the 'environment and 'client parameters. (let ((env (frame-parameter oldframe 'environment)) - (client (frame-parameter oldframe 'client)) - (displayenv (frame-parameter oldframe 'display-environment-variable))) + (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 displayenv (not (assq 'display-environment-variable parameters))) - (set-frame-parameter frame 'display-environment-variable displayenv)) (if (and client (not (assq 'client parameters))) (set-frame-parameter frame 'client client))) (run-hook-with-args 'after-make-frame-functions frame)