summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2019-05-27 09:21:37 +0200
committerMichael Albinus <michael.albinus@gmx.de>2019-05-27 09:21:37 +0200
commit457b02440510a594e3ff6f17cc6846a3a467a6a1 (patch)
treed7478ec167af301ff97b9796492505a9d8a885f7 /lisp/net
parentdc9f8c1c63fd7fb2c39c9263424fe7fc9dca66ae (diff)
downloademacs-457b02440510a594e3ff6f17cc6846a3a467a6a1.tar.gz
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)
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp.el3
1 files changed, 3 insertions, 0 deletions
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