From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 27 May 2019 07:21:37 +0000 (+0200)
Subject: Another attempt to fix Bug#35769
X-Git-Tag: emacs-27.0.90~2778
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=457b02440510a594e3ff6f17cc6846a3a467a6a1;p=emacs.git

Another attempt to fix Bug#35769

* lisp/net/tramp.el (tramp-call-process, tramp-call-process-region)
(tramp-process-lines): Suppress `process-environment' entries
dedicated for remote processes.  (Bug#35769)
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 48152444a61..a2558184fb4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4637,6 +4637,7 @@ It always returns a return code.  The Lisp error raised when
 PROGRAM is nil is trapped also, returning 1.  Furthermore, traces
 are written with verbosity of 6."
   (let ((default-directory (tramp-compat-temporary-file-directory))
+	(process-environment (default-toplevel-value 'process-environment))
 	(destination (if (eq destination t) (current-buffer) destination))
 	(vec (or vec (car tramp-current-connection)))
 	output error result)
@@ -4670,6 +4671,7 @@ It always returns a return code.  The Lisp error raised when
 PROGRAM is nil is trapped also, returning 1.  Furthermore, traces
 are written with verbosity of 6."
   (let ((default-directory (tramp-compat-temporary-file-directory))
+	(process-environment (default-toplevel-value 'process-environment))
 	(buffer (if (eq buffer t) (current-buffer) buffer))
 	result)
     (tramp-message
@@ -4699,6 +4701,7 @@ are written with verbosity of 6."
 If an error occurs, it returns nil.  Traces are written with
 verbosity of 6."
   (let ((default-directory (tramp-compat-temporary-file-directory))
+	(process-environment (default-toplevel-value 'process-environment))
 	(vec (or vec (car tramp-current-connection)))
 	result)
     (if args