# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1188545902 0
# Node ID 54a50419f5fe31453f152638cb136b1f28fb2e3e
# Parent  9154949e469c56f5d3dd1714e353559b8aae6ef7
(frame-initialize, make-frame): Don't set
term-environment-variable since it's not used any more.

diff -r 9154949e469c -r 54a50419f5fe lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 31 07:37:33 2007 +0000
+++ b/lisp/ChangeLog	Fri Aug 31 07:38:22 2007 +0000
@@ -1,5 +1,12 @@
 2007-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* frame.el (frame-initialize, make-frame):
+	* server.el (server-process-filter):
+	* faces.el (tty-set-up-initial-frame-faces): Don't set
+	term-environment-variable since it's not used any more.
+
+	* env.el (setenv): Don't treat $TERM specially.
+
 	* startup.el (normal-top-level): Set $TERM to `dumb' so that unless
 	stated otherwise, subprocesses do not send back escape sequences
 	corresponding to the terminal from which Emacs was started.
diff -r 9154949e469c -r 54a50419f5fe lisp/frame.el
--- a/lisp/frame.el	Fri Aug 31 07:37:33 2007 +0000
+++ b/lisp/frame.el	Fri Aug 31 07:38:22 2007 +0000
@@ -241,8 +241,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 'term-environment-variable
-			     (getenv "TERM"))
 	(set-frame-parameter frame-initial-frame 'display-environment-variable
 			     (getenv "DISPLAY"))
 	;; At this point, we know that we have a frame open, so we
@@ -731,14 +729,11 @@
     ;; Inherit the 'environment and 'client parameters.
     (let ((env (frame-parameter oldframe 'environment))
 	  (client (frame-parameter oldframe 'client))
-	   (termenv (frame-parameter oldframe 'term-environment-variable))
 	   (displayenv (frame-parameter oldframe 'display-environment-variable)))
       (if (not (framep env))
 	  (setq env oldframe))
       (if (and env (not (assq 'environment parameters)))
 	  (set-frame-parameter frame 'environment env))
-      (if (and termenv (not (assq 'term-environment-variable parameters)))
-	  (set-frame-parameter frame 'term-environment-variable termenv))
       (if (and displayenv (not (assq 'display-environment-variable parameters)))
 	  (set-frame-parameter frame 'display-environment-variable displayenv))
       (if (and client (not (assq 'client parameters)))