From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 18 Sep 2022 10:51:52 +0000 (+0200)
Subject: Fix Tramp error with eshell integration
X-Git-Tag: emacs-28.3-rc1~76
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69cc3d38bc7b5887e7f1497937d0ea8be1f70673;p=emacs.git

Fix Tramp error with eshell integration

* lisp/net/tramp-integration.el (tramp-eshell-directory-change):
Respect local `default-directory'.  (Bug#57556)
---

diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index b5df9804ab4..9aa4b2b1e84 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -134,8 +134,10 @@ been set up by `rfn-eshadow-setup-minibuffer'."
   ;; Remove last element of `(exec-path)', which is `exec-directory'.
   ;; Use `path-separator' as it does eshell.
   (setq eshell-path-env
-	(mapconcat
-	 #'identity (butlast (tramp-compat-exec-path)) path-separator)))
+        (if (file-remote-p default-directory)
+            (mapconcat
+	     #'identity (butlast (tramp-compat-exec-path)) path-separator)
+          (getenv "PATH"))))
 
 (with-eval-after-load 'esh-util
   (add-hook 'eshell-mode-hook