aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2007-09-21 07:23:04 +0000
committerStefan Monnier <[email protected]>2007-09-21 07:23:04 +0000
commit5dcbade216d423b447bf3539d835225921b98c57 (patch)
tree8b0c0fbf3c77cce0332113e5b8ff05e42f528406 /lisp/frame.el
parent473a8c581ae7311f202d7dfa56e9b6492619364d (diff)
Don't set display-environment-variable.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 7f5cdbe19d..3e7eb9653c 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)