[Emacs-diffs] emacs-26 0d2bf76: Adapt Tramp version. Do not merge with master

[Michael Albinus]

branch: emacs-26
commit 0d2bf76d3d8a9d05e3b9ff4228608aa446352e7e
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
---
 lisp/net/trampver.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 6454b5b..7badcd1 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <address@hidden>
 ;; 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 ()