From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 31 Aug 2007 07:38:22 +0000 (+0000)
Subject: (frame-initialize, make-frame): Don't set
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/db30aa125eb51f143165ec4b21cea170681bc244?ds=sidebyside

(frame-initialize, make-frame): Don't set
term-environment-variable since it's not used any more.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff7b73e50c..390fd60555 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/frame.el b/lisp/frame.el
index 6b8dba8131..e9d9489fb6 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -241,8 +241,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 '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 @@ setup is for focus to follow the pointer."
     ;; 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)))