diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2019-06-15 21:38:11 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-15 21:38:11 +0200 |
commit | f87a9e359e94587b301cb65d8a255381fee687bf (patch) | |
tree | 6b5f2d76ee05a7fe18b1ce9a652f61b8ec38a45c /lisp | |
parent | 200f63cfa5904462cdcb440d4da63dfa92c666a6 (diff) | |
download | emacs-f87a9e359e94587b301cb65d8a255381fee687bf.tar.gz |
Fix accidential change in tramp-tests; do not merge with master
* lisp/net/trampver.el: Change version to "2.3.5.26.3".
(customize-package-emacs-version-alist): Add Tramp version
integrated in Emacs 26.3.
* test/lisp/net/tramp-tests.el (tramp-test42-auto-load):
Add skip for w32.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/net/trampver.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 5f10cd30ba6..81d80d0a5a7 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.5.26.2 +;; Version: 2.3.5.26.3 ;; This file is part of GNU Emacs. @@ -33,7 +33,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.3.5.26.2" +(defconst tramp-version "2.3.5.26.3" "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.5.26.2 is not fit for %s" + (format "Tramp 2.3.5.26.3 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) @@ -74,7 +74,8 @@ ("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") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2"))) + ("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"))) (add-hook 'tramp-unload-hook (lambda () |