From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 26 May 2019 19:37:34 +0000 (+0200)
Subject: * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Revert fix for Bug#35769
X-Git-Tag: emacs-27.0.90~2781
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e8aad77b10767c76ffdc56875e470b551e3fa56;p=emacs.git

* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Revert fix for Bug#35769
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 11b1af8116e..2d27baf454a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4769,8 +4769,8 @@ 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))
 	(process-name (tramp-get-connection-property vec "process-name" nil))
-	(pos (with-current-buffer (tramp-get-connection-buffer vec) (point)))
-	tmp-process-environment)
+	(process-environment (copy-sequence process-environment))
+	(pos (with-current-buffer (tramp-get-connection-buffer vec) (point))))
 
     ;; If Tramp opens the same connection within a short time frame,
     ;; there is a problem.  We shall signal this.
@@ -4835,22 +4835,17 @@ connection if a previous connection has died for some reason."
 	      ;; Start new process.
 	      (when (and p (processp p))
 		(delete-process p))
-	      ;; Use a temporary `process-environment', in order not
-	      ;; to penetrate local processes.
-	      (let ((process-environment (copy-sequence process-environment)))
-		(setenv "TERM" tramp-terminal-type)
-		(setenv "LC_ALL" (tramp-get-local-locale vec))
-		(if (stringp tramp-histfile-override)
-		    (setenv "HISTFILE" tramp-histfile-override)
-		  (if tramp-histfile-override
-		      (progn
-			(setenv "HISTFILE")
-			(setenv "HISTFILESIZE" "0")
-			(setenv "HISTSIZE" "0"))))
-		(setenv "PROMPT_COMMAND")
-		(setenv "PS1" tramp-initial-end-of-output)
-		(setq tmp-process-environment
-		      (copy-sequence process-environment)))
+	      (setenv "TERM" tramp-terminal-type)
+	      (setenv "LC_ALL" (tramp-get-local-locale vec))
+	      (if (stringp tramp-histfile-override)
+		  (setenv "HISTFILE" tramp-histfile-override)
+		(if tramp-histfile-override
+		    (progn
+		      (setenv "HISTFILE")
+		      (setenv "HISTFILESIZE" "0")
+		      (setenv "HISTSIZE" "0"))))
+	      (setenv "PROMPT_COMMAND")
+	      (setenv "PS1" tramp-initial-end-of-output)
               (unless (stringp tramp-encoding-shell)
                 (tramp-error vec 'file-error "`tramp-encoding-shell' not set"))
 	      (let* ((current-host (system-name))
@@ -4867,8 +4862,7 @@ connection if a previous connection has died for some reason."
 		     ;; This must be done in order to avoid our file
 		     ;; name handler.
 		     (p (let ((default-directory
-				(tramp-compat-temporary-file-directory))
-			      (process-environment tmp-process-environment))
+				(tramp-compat-temporary-file-directory)))
 			  (apply
 			   #'start-process
 			   (tramp-get-connection-name vec)