Don't set display-environment-variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f110f0a0d2f15ec090dc2cf4b6ddfa291a824d5..c95f4b36d29e87fc137f7728cb66fc8ab76632e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)

diff --git a/lisp/faces.el b/lisp/faces.el
index f9dae8e399e65665671748e3f36410685728b41c..e1cfd8ac9aa0fac3291ce2f7efed3a8bcd84059f 100644 (file)
--- 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 7f5cdbe19dc855bde2274fe74b4c8b1c1a6cefcc..3e7eb9653c06c031002e12cf6a5a0d82c114ae85 100644 (file)
--- 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)