[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 3003ac0: Adapt Tramp version. Do not merge
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-26 3003ac0: Adapt Tramp version. Do not merge |
Date: |
Sun, 17 Sep 2017 04:03:29 -0400 (EDT) |
branch: emacs-26
commit 3003ac046900f9e7fdaa3161b99dbb1cc8f37b32
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Adapt Tramp version. Do not merge
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.3.3.26.1".
(customize-package-emacs-version-alist): Add Tramp version
integrated in Emacs 26.1.
---
doc/misc/trampver.texi | 2 +-
lisp/net/trampver.el | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 5d9dcc5..5151ed5 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
@c In the Tramp GIT, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
address@hidden trampver 2.3.3-pre
address@hidden trampver 2.3.3.26.1
@c Other flags from configuration
@set instprefix /usr/local
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 91222bd..318e335 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.3-pre
+;; Version: 2.3.3.26.1
;; This file is part of GNU Emacs.
@@ -33,7 +33,7 @@
;; should be changed only there.
;;;###tramp-autoload
-(defconst tramp-version "2.3.3-pre"
+(defconst tramp-version "2.3.3.26.1"
"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.3-pre is not fit for %s"
+ (format "Tramp 2.3.3.26.1 is not fit for %s"
(when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))
@@ -69,7 +69,8 @@
("2.2.3-24.1" . "24.1") ("2.2.3-24.1" . "24.2") ("2.2.6-24.3" . "24.3")
("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.2.13.25.2" . "25.3")
+ ("2.3.3.26.1" . "26.1")))
(add-hook 'tramp-unload-hook
(lambda ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 3003ac0: Adapt Tramp version. Do not merge,
Michael Albinus <=