From 5dcbade216d423b447bf3539d835225921b98c57 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 21 Sep 2007 07:23:04 +0000 Subject: [PATCH] Don't set display-environment-variable. --- lisp/ChangeLog | 6 ++++++ lisp/faces.el | 4 +--- lisp/frame.el | 7 +------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f110f0a0d2..c95f4b36d29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-09-21 Stefan Monnier + + * 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 * emacs-lisp/bytecomp.el (byte-compile-warnings) diff --git a/lisp/faces.el b/lisp/faces.el index f9dae8e399e..e1cfd8ac9aa 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1935,9 +1935,7 @@ terminal type to a different value." (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))) diff --git a/lisp/frame.el b/lisp/frame.el index 7f5cdbe19dc..3e7eb9653c0 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -240,8 +240,6 @@ Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args." ;; 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 @@ setup is for focus to follow the pointer." (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) -- 2.39.5