From 9e0085064b2f48f0f3bc52159da94ab4424fef6f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 30 Nov 2020 13:19:19 +0100 Subject: [PATCH] Adapt Tramp versions. Do not merge * doc/misc/tramp.texi (Obtaining @value{tramp}) (Remote shell setup, Remote processes, Archive file names): * doc/misc/trampver.texi: * lisp/net/tramp.el: * lisp/net/trampver.el (tramp-version) (customize-package-emacs-version-alist): Adapt Tramp versions. --- doc/misc/tramp.texi | 22 +++++++++++----------- doc/misc/trampver.texi | 2 +- lisp/net/tramp.el | 2 +- lisp/net/trampver.el | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index cae0abfbf3a..660237bcc5c 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -318,14 +318,14 @@ behind the scenes when you open a file with @value{tramp}. @uref{https://ftp.gnu.org/gnu/tramp/}. The version number of @value{tramp} can be obtained by the variable @code{tramp-version}. For released @value{tramp} versions, this is a three-number string -like ``2.4.3''. +like ``2.4.5''. A @value{tramp} release, which is packaged with Emacs, could differ slightly from the corresponding standalone release. This is because it isn't always possible to synchronize release dates between Emacs and @value{tramp}. Such version numbers have the Emacs version number -as suffix, like ``2.4.3.27.1''. This means @value{tramp} 2.4.3 as -integrated in Emacs 27.1. A complete list of @value{tramp} versions +as suffix, like ``2.4.5.27.2''. This means @value{tramp} 2.4.5 as +integrated in Emacs 27.2. A complete list of @value{tramp} versions packaged with Emacs can be retrieved by @vindex customize-package-emacs-version-alist @@ -337,7 +337,7 @@ packaged with Emacs can be retrieved by ELPA} package. Besides the standalone releases, further minor version of @value{tramp} will appear on GNU ELPA, until the next @value{tramp} release appears. These minor versions have a four-number string, like -``2.4.3.1''. +``2.4.5.1''. @value{tramp} development versions are available on Git servers. Development versions contain new and incomplete features. The @@ -2299,7 +2299,7 @@ string of that environment variable looks always like @example @group echo $INSIDE_EMACS -@result{} 27.1,tramp:2.4.3 +@result{} 27.2,tramp:2.4.5 @end group @end example @@ -3047,9 +3047,9 @@ integrated to work with @value{tramp}: @file{shell.el}, @value{tramp} always modifies the @env{INSIDE_EMACS} environment variable for remote processes. Per default, this environment variable shows the Emacs version. @value{tramp} adds its own version string, -so it looks like @samp{27.1,tramp:2.4.3.1}. However, other packages +so it looks like @samp{27.2,tramp:2.4.5.1}. However, other packages might also add their name to this environment variable, like -@samp{27.1,comint,tramp:2.4.3.1}. +@samp{27.2,comint,tramp:2.4.5.1}. For @value{tramp} to find the command on the remote, it must be accessible through the default search path as setup by @value{tramp} @@ -3731,7 +3731,7 @@ row are possible, like @file{/path/to/dir/file.tar.gz.uu/dir/file}. @vindex tramp-archive-all-gvfs-methods An archive file name could be a remote file name, as in -@file{/ftp:anonymous@@ftp.gnu.org:/gnu/tramp/tramp-2.4.3.tar.gz/INSTALL}. +@file{/ftp:anonymous@@ftp.gnu.org:/gnu/tramp/tramp-2.4.5.tar.gz/INSTALL}. Since all file operations are mapped internally to @acronym{GVFS} operations, remote file names supported by @code{tramp-gvfs} perform better, because no local copy of the file archive must be downloaded @@ -3742,7 +3742,7 @@ the similar @samp{/scp:user@@host:...}. See the constant If @code{url-handler-mode} is enabled, archives could be visited via URLs, like -@file{https://ftp.gnu.org/gnu/tramp/tramp-2.4.3.tar.gz/INSTALL}. This +@file{https://ftp.gnu.org/gnu/tramp/tramp-2.4.5.tar.gz/INSTALL}. This allows complex file operations like @lisp @@ -3750,8 +3750,8 @@ allows complex file operations like (progn (url-handler-mode 1) (ediff-directories - "https://ftp.gnu.org/gnu/tramp/tramp-2.4.2.tar.gz/tramp-2.4.2" - "https://ftp.gnu.org/gnu/tramp/tramp-2.4.3.tar.gz/tramp-2.4.3" "")) + "https://ftp.gnu.org/gnu/tramp/tramp-2.4.4.tar.gz/tramp-2.4.4" + "https://ftp.gnu.org/gnu/tramp/tramp-2.4.5.tar.gz/tramp-2.4.5" "")) @end group @end lisp diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index cc3c768fe6e..137d130aa89 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/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.4.5-pre +@set trampver 2.4.5.27.2 @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 24.4 diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5a08fa89339..cf8ec69cb39 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.4.5-pre +;; Version: 2.4.5.27.2 ;; Package-Requires: ((emacs "24.4")) ;; Package-Type: multi ;; URL: https://savannah.gnu.org/projects/tramp diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 4aed8abd9b3..8838d56ac8e 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -39,7 +39,7 @@ (defvar inhibit-message) ;;;###tramp-autoload -(defconst tramp-version "2.4.5-pre" +(defconst tramp-version "2.4.5.27.2" "This version of Tramp.") ;;;###tramp-autoload @@ -75,7 +75,7 @@ ;; Check for Emacs version. (let ((x (if (not (string-lessp emacs-version "24.4")) "ok" - (format "Tramp 2.4.5-pre is not fit for %s" + (format "Tramp 2.4.5.27.2 is not fit for %s" (replace-regexp-in-string "\n" "" (emacs-version)))))) (unless (string-equal "ok" x) (error "%s" x))) @@ -95,7 +95,7 @@ ("2.2.13.25.2" . "25.3") ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2") ("2.3.5.26.3" . "26.3") - ("2.4.3.27.1" . "27.1"))) + ("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2"))) (add-hook 'tramp-unload-hook (lambda () -- 2.39.2