From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 9 Jan 2013 09:49:27 +0000 (+0100)
Subject: * net/tramp.el (tramp-eshell-directory-change): Check remote-path
X-Git-Tag: emacs-24.3.90~173^2~7^2~365
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ccd04887a3f15ce0e52af801d8a70c91d695f78c;p=emacs.git

* net/tramp.el (tramp-eshell-directory-change): Check remote-path
first in session cache: When `tramp-own-remote-path' is in
`tramp-remote-path', the remote path is only set in the session
cache.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e60321744bb..35a8d1171db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-09  Jürgen Hötzel  <juergen@archlinux.org>
+
+	* net/tramp.el (tramp-eshell-directory-change): Check remote-path
+	first in session cache: When `tramp-own-remote-path' is in
+	`tramp-remote-path', the remote path is only set in the session
+	cache.
+
 2013-01-09  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/trace.el (trace-function-foreground)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f8db03ee4d7..2c4aac0ac8a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3901,7 +3901,12 @@ Only works for Bourne-like shells."
 	    (with-parsed-tramp-file-name default-directory nil
 	      (mapconcat
 	       'identity
-	       (tramp-get-connection-property v "remote-path" nil)
+	       (or
+		;; When `tramp-own-remote-path' is in `tramp-remote-path',
+		;; the remote path is only set in the session cache.
+		(tramp-get-connection-property
+		 (tramp-get-connection-process v) "remote-path" nil)
+		(tramp-get-connection-property v "remote-path" nil))
 	       ":"))
 	  (getenv "PATH"))))