branch: externals/tramp
commit b0bcbecc1c74bf9e19d6d71033f1bb92af77e314
Author: Michael Albinus <michael.albi...@gmx.de>
Commit: Michael Albinus <michael.albi...@gmx.de>
Tramp ELPA version 2.5.3.3 released
---
README | 4 ++--
texi/trampver.texi | 2 +-
tramp-integration.el | 6 ++++--
trampver.el | 6 +++---
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/README b/README
index 0139ea0108..9a93daa14a 100644
--- a/README
+++ b/README
@@ -22,11 +22,11 @@ installed with, you must recompile the package:
* Remove all byte-compiled Tramp files
- $ rm -f ~/.emacs.d/elpa/tramp-2.5.3.2/tramp*.elc
+ $ rm -f ~/.emacs.d/elpa/tramp-2.5.3.3/tramp*.elc
* Start Emacs with Tramp's source files
- $ emacs -L ~/.emacs.d/elpa/tramp-2.5.3.2 -l tramp
+ $ emacs -L ~/.emacs.d/elpa/tramp-2.5.3.3 -l tramp
This should not give you the error.
diff --git a/texi/trampver.texi b/texi/trampver.texi
index 019ae36e4d..ac7d6c01d2 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -8,7 +8,7 @@
@c In the Tramp GIT, the version numbers are auto-frobbed from
@c tramp.el, and the bug report address is auto-frobbed from
@c configure.ac.
-@set trampver 2.5.3.2
+@set trampver 2.5.3.3
@set trampurl https://www.gnu.org/software/tramp/
@set tramp-bug-report-address tramp-devel@@gnu.org
@set emacsver 25.1
diff --git a/tramp-integration.el b/tramp-integration.el
index b5df9804ab..9aa4b2b1e8 100644
--- a/tramp-integration.el
+++ b/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
diff --git a/trampver.el b/trampver.el
index fe6e7fedf9..f82bc6a15f 100644
--- a/trampver.el
+++ b/trampver.el
@@ -7,7 +7,7 @@
;; Maintainer: Michael Albinus <michael.albi...@gmx.de>
;; Keywords: comm, processes
;; Package: tramp
-;; Version: 2.5.3.2
+;; Version: 2.5.3.3
;; Package-Requires: ((emacs "25.1"))
;; Package-Type: multi
;; URL: https://www.gnu.org/software/tramp/
@@ -40,7 +40,7 @@
;; ./configure" to change them.
;;;###tramp-autoload
-(defconst tramp-version "2.5.3.2"
+(defconst tramp-version "2.5.3.3"
"This version of Tramp.")
;;;###tramp-autoload
@@ -78,7 +78,7 @@
;; Check for Emacs version.
(let ((x (if (not (string-lessp emacs-version "25.1"))
"ok"
- (format "Tramp 2.5.3.2 is not fit for %s"
+ (format "Tramp 2.5.3.3 is not fit for %s"
(replace-regexp-in-string "\n" "" (emacs-version))))))
(unless (string-equal "ok" x) (error "%s" x)))
