# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1190359384 0
# Node ID b81c5052c6af65b7e3faa1a1967c611db5d363fb
# Parent  bf9d24dbf5a900c817f863cfb1f47a6d0eae19fa
Don't set display-environment-variable.

diff -r bf9d24dbf5a9 -r b81c5052c6af lisp/ChangeLog
--- 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)
diff -r bf9d24dbf5a9 -r b81c5052c6af lisp/faces.el
--- 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)))
 
 
 
diff -r bf9d24dbf5a9 -r b81c5052c6af lisp/frame.el
--- 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)