diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2023-02-24 19:42:27 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2023-02-24 19:42:27 +0100 |
| commit | dec958258b133b4c21224c594da433919d852800 (patch) | |
| tree | c44144897f778e00616a48fed0dd017102fe9b16 | |
| parent | 3c9701938d49aacd05e2cbb38fe4c05eb1261170 (diff) | |
| download | emacs-28.tar.gz | |
Adapt Tramp versions. Do not mergeemacs-28
* doc/misc/trampver.texi:
* lisp/net/trampver.el (tramp-version)
(customize-package-emacs-version-alist): Adapt Tramp versions.
| -rw-r--r-- | doc/misc/trampver.texi | 2 | ||||
| -rw-r--r-- | 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 b6aad22b9cc..466cd182111 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.5.4-pre +@set trampver 2.5.4 @set trampurl https://www.gnu.org/software/tramp/ @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 25.1 diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 6e379446bf0..39a80ce4c36 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.5.4-pre +;; Version: 2.5.4 ;; 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.4-pre" +(defconst tramp-version "2.5.4" "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.4-pre is not fit for %s" + (format "Tramp 2.5.4 is not fit for %s" (replace-regexp-in-string "\n" "" (emacs-version)))))) (unless (string-equal "ok" x) (error "%s" x))) @@ -104,7 +104,7 @@ ("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.5.27.2" . "27.2") - ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2"))) + ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") ("2.5.4" . "28.3"))) (add-hook 'tramp-unload-hook (lambda () |