Mercurial > emacs
changeset 85970:c73d915c130c
* net/tramp.el (tramp-maybe-open-connection): Use a local copy of
`process-environment'.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Thu, 08 Nov 2007 20:15:25 +0000 |
parents | a21b192da2e9 |
children | 2e692f327278 |
files | lisp/ChangeLog lisp/net/tramp.el |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 08 17:37:29 2007 +0000 +++ b/lisp/ChangeLog Thu Nov 08 20:15:25 2007 +0000 @@ -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
--- a/lisp/net/tramp.el Thu Nov 08 17:37:29 2007 +0000 +++ b/lisp/net/tramp.el Thu Nov 08 20:15:25 2007 +0000 @@ -6020,7 +6020,8 @@ "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 @@ (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)