master 398a8c7a6e3: Change Tramp version integrated in Emacs 31.1

Michael Albinus via Mailing list for Emacs changes <[email protected]> Wed, 1 Jul 2026 11:11:00 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
branch: master
commit 398a8c7a6e318ad74dec379263a644b7f1708b5f
Author: Michael Albinus <[email protected]>
Commit: Michael Albinus <[email protected]>

    Change Tramp version integrated in Emacs 31.1
    
    * doc/misc/trampver.texi:
    * lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
    
    * lisp/net/trampver.el (customize-package-emacs-version-alist):
    Change Tramp version integrated in Emacs 31.1.
---
 doc/misc/trampver.texi | 2 +-
 lisp/net/trampver.el   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 165d0eb1352..07f017403f9 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -7,7 +7,7 @@
 
 @c In the  Tramp GIT, the version number and the bug report address
 @c are auto-frobbed from configure.ac.
-@set trampver 2.8.2
+@set trampver 2.8.3-pre
 @set trampurl https://www.gnu.org/software/tramp/
 @set tramp-bug-report-address tramp-devel@@gnu.org
 @set emacsver 28.1
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 00d5ffb2afa..d65cffbabec 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <[email protected]>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.8.2
+;; Version: 2.8.3-pre
 ;; Package-Requires: ((emacs "28.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.8.2"
+(defconst tramp-version "2.8.3-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -76,7 +76,7 @@
 ;; Check for Emacs version.
 (let ((x   (if (not (string-version-lessp emacs-version "28.1"))
       "ok"
-    (format "Tramp 2.8.2 is not fit for %s"
+    (format "Tramp 2.8.3-pre is not fit for %s"
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))
 
@@ -110,7 +110,7 @@
          ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2") ("2.6.3-pre" . "29.3")
 	 ("2.6.3" . "29.4")
 	 ("2.7.1.30.1" . "30.1") ("2.7.3.30.2" . "30.2")
-	 ("2.8.2" . "31.1")))
+	 ("2.8.2.31.1" . "31.1")))
 
 (add-hook 'tramp-unload-hook
 	  (lambda ()