aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus2019-06-15 21:38:11 +0200
committerMichael Albinus2019-06-15 21:38:11 +0200
commitf87a9e359e94587b301cb65d8a255381fee687bf (patch)
tree6b5f2d76ee05a7fe18b1ce9a652f61b8ec38a45c /lisp
parent200f63cfa5904462cdcb440d4da63dfa92c666a6 (diff)
downloademacs-f87a9e359e94587b301cb65d8a255381fee687bf.tar.gz
emacs-f87a9e359e94587b301cb65d8a255381fee687bf.zip
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.el9
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 @@
7;; Maintainer: Michael Albinus <michael.albinus@gmx.de> 7;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
8;; Keywords: comm, processes 8;; Keywords: comm, processes
9;; Package: tramp 9;; Package: tramp
10;; Version: 2.3.5.26.2 10;; Version: 2.3.5.26.3
11 11
12;; This file is part of GNU Emacs. 12;; This file is part of GNU Emacs.
13 13
@@ -33,7 +33,7 @@
33;; should be changed only there. 33;; should be changed only there.
34 34
35;;;###tramp-autoload 35;;;###tramp-autoload
36(defconst tramp-version "2.3.5.26.2" 36(defconst tramp-version "2.3.5.26.3"
37 "This version of Tramp.") 37 "This version of Tramp.")
38 38
39;;;###tramp-autoload 39;;;###tramp-autoload
@@ -55,7 +55,7 @@
55;; Check for Emacs version. 55;; Check for Emacs version.
56(let ((x (if (>= emacs-major-version 24) 56(let ((x (if (>= emacs-major-version 24)
57 "ok" 57 "ok"
58 (format "Tramp 2.3.5.26.2 is not fit for %s" 58 (format "Tramp 2.3.5.26.3 is not fit for %s"
59 (when (string-match "^.*$" (emacs-version)) 59 (when (string-match "^.*$" (emacs-version))
60 (match-string 0 (emacs-version))))))) 60 (match-string 0 (emacs-version)))))))
61 (unless (string-match "\\`ok\\'" x) (error "%s" x))) 61 (unless (string-match "\\`ok\\'" x) (error "%s" x)))
@@ -74,7 +74,8 @@
74 ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5") 74 ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
75 ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2") 75 ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
76 ("2.2.13.25.2" . "25.3") 76 ("2.2.13.25.2" . "25.3")
77 ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2"))) 77 ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")
78 ("2.3.5.26.3" . "26.3")))
78 79
79(add-hook 'tramp-unload-hook 80(add-hook 'tramp-unload-hook
80 (lambda () 81 (lambda ()