summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-10-11 09:39:12 +0200
committerMichael Albinus <michael.albinus@gmx.de>2018-10-11 09:39:12 +0200
commit0d2bf76d3d8a9d05e3b9ff4228608aa446352e7e (patch)
treece06a40e1f3b37a468aed7a11568b5b1d53a3ae4
parent6e54762c3726be9e11b4beb21214abcd4192783a (diff)
downloademacs-0d2bf76d3d8a9d05e3b9ff4228608aa446352e7e.tar.gz
Adapt Tramp version. Do not merge with master
* lisp/net/trampver.el: Change version to "2.3.5.26.2". (customize-package-emacs-version-alist): Add Tramp version integrated in Emacs 26.2.
-rw-r--r--lisp/net/trampver.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 6454b5b8f8b..7badcd19f84 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.3.4.26.2
+;; Version: 2.3.5.26.2
;; This file is part of GNU Emacs.
@@ -33,7 +33,7 @@
;; should be changed only there.
;;;###tramp-autoload
-(defconst tramp-version "2.3.4.26.2"
+(defconst tramp-version "2.3.5.26.2"
"This version of Tramp.")
;;;###tramp-autoload
@@ -55,7 +55,7 @@
;; Check for Emacs version.
(let ((x (if (>= emacs-major-version 24)
"ok"
- (format "Tramp 2.3.4.26.2 is not fit for %s"
+ (format "Tramp 2.3.5.26.2 is not fit for %s"
(when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))
@@ -70,7 +70,7 @@
("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
("2.2.13.25.2" . "25.3")
- ("2.3.3.26.1" . "26.1") ("2.3.4.26.2" . "26.2")))
+ ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")))
(add-hook 'tramp-unload-hook
(lambda ()