From 305e35b2d871fdf86e7a349443fc4507d540e11e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 31 Mar 2024 14:13:14 +0200 Subject: [PATCH] Adapt Tramp versio (don't merge) * doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.6.3". (customize-package-emacs-version-alist): Adapt Tramp version integrated in Emacs 29.3. --- 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 956d055fdaf..fcbcab60bc7 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.6.3-pre +@set trampver 2.6.3 @set trampurl https://www.gnu.org/software/tramp/ @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 26.1 diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 1647960ef0e..c7e3e6eafc0 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.6.3-pre +;; Version: 2.6.3 ;; Package-Requires: ((emacs "26.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.6.3-pre" +(defconst tramp-version "2.6.3" "This version of Tramp.") ;;;###tramp-autoload @@ -78,7 +78,7 @@ ;; Check for Emacs version. (let ((x (if (not (string-version-lessp emacs-version "26.1")) "ok" - (format "Tramp 2.6.3-pre is not fit for %s" + (format "Tramp 2.6.3 is not fit for %s" (replace-regexp-in-string "\n" "" (emacs-version)))))) (unless (string-equal "ok" x) (error "%s" x))) @@ -105,7 +105,7 @@ ("2.3.5.26.3" . "26.3") ("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2") ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") ("2.5.4" . "28.3") - ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2"))) + ("2.6.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2") ("2.6.3-pre" . "29.3"))) (add-hook 'tramp-unload-hook (lambda ()