diff options
| author | Michael Albinus | 2018-10-11 09:39:12 +0200 |
|---|---|---|
| committer | Michael Albinus | 2018-10-11 09:39:12 +0200 |
| commit | 0d2bf76d3d8a9d05e3b9ff4228608aa446352e7e (patch) | |
| tree | ce06a40e1f3b37a468aed7a11568b5b1d53a3ae4 | |
| parent | 6e54762c3726be9e11b4beb21214abcd4192783a (diff) | |
| download | emacs-0d2bf76d3d8a9d05e3b9ff4228608aa446352e7e.tar.gz emacs-0d2bf76d3d8a9d05e3b9ff4228608aa446352e7e.zip | |
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.el | 8 |
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 @@ | |||
| 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.4.26.2 | 10 | ;; Version: 2.3.5.26.2 |
| 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.4.26.2" | 36 | (defconst tramp-version "2.3.5.26.2" |
| 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.4.26.2 is not fit for %s" | 58 | (format "Tramp 2.3.5.26.2 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))) |
| @@ -70,7 +70,7 @@ | |||
| 70 | ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5") | 70 | ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5") |
| 71 | ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2") | 71 | ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2") |
| 72 | ("2.2.13.25.2" . "25.3") | 72 | ("2.2.13.25.2" . "25.3") |
| 73 | ("2.3.3.26.1" . "26.1") ("2.3.4.26.2" . "26.2"))) | 73 | ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2"))) |
| 74 | 74 | ||
| 75 | (add-hook 'tramp-unload-hook | 75 | (add-hook 'tramp-unload-hook |
| 76 | (lambda () | 76 | (lambda () |