From: Michael Albinus Date: Thu, 19 Oct 2023 14:28:26 +0000 (+0200) Subject: Update Tramp version (don't merge with master) X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62920dcb0de440aac8e7d69ee33f27d5400d405e;p=emacs.git Update Tramp version (don't merge with master) * doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.6.2.29.2". (customize-package-emacs-version-alist): Adapt Tramp version integrated in Emacs 29.2. --- diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index c2560169e31..a2ab225f7f7 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.2-pre +@set trampver 2.6.2.29.2 @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 f96ffac2e13..44a39dbfc12 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.2-pre +;; Version: 2.6.2.29.2 ;; 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.2-pre" +(defconst tramp-version "2.6.2.29.2" "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.2-pre is not fit for %s" + (format "Tramp 2.6.2.29.2 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.0.29.1" . "29.1") ("2.6.2.29.2" . "29.2"))) (add-hook 'tramp-unload-hook (lambda ()