From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 8 Nov 2007 20:15:25 +0000 (+0000)
Subject: * net/tramp.el (tramp-maybe-open-connection): Use a local copy of
X-Git-Tag: emacs-pretest-23.0.90~9833
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67932d94602d81049464329e40b4b6358b3a2313;p=emacs.git

* net/tramp.el (tramp-maybe-open-connection): Use a local copy of
`process-environment'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1c520e6d97..d61d09008fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-maybe-open-connection): Use a local copy of
+	`process-environment'.
+
 2007-11-08  David Hansen  <david.hansen@gmx.net>  (tiny change)
 
 	* eshell/em-dirs.el (eshell-expand-multiple-dots): Change regexp to
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a207171a4a1..93fdea9ab27 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6020,7 +6020,8 @@ Gateway hops are already opened."
   "Maybe open a connection VEC.
 Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
-  (let ((p (tramp-get-connection-process vec)))
+  (let ((p (tramp-get-connection-process vec))
+	(process-environment (copy-sequence process-environment)))
 
     ;; If too much time has passed since last command was sent, look
     ;; whether process is still alive.  If it isn't, kill it.  When
@@ -6072,7 +6073,6 @@ connection if a previous connection has died for some reason."
       (setenv "PROMPT_COMMAND")
       (setenv "PS1" "$ ")
       (let* ((target-alist (tramp-compute-multi-hops vec))
-	     (process-environment (copy-sequence process-environment))
 	     (process-connection-type tramp-process-connection-type)
 	     (process-adaptive-read-buffering nil)
 	     (coding-system-for-read nil)