Sync with Tramp 2.3.0

* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.3.0".

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index cdd008bc8651dc157e2c7bdeb99f3298d1a978f2..6f67f35902a72ef514bb4bace0d0478345ee16ee 100644 (file)
--- 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.
-@set trampver 2.3.0-pre
+@set trampver 2.3.0
 
 @c Other flags from configuration
 @set instprefix /usr/local

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 64cc47e26a5244470581989ba4586a83e1efe94d..aea260541e9b9a98cc85199c40d7cbbba7674dbd 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -6,7 +6,7 @@
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.3.0-pre
+;; Version: 2.3.0
 
 ;; This file is part of GNU Emacs.
 
@@ -32,7 +32,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.3.0-pre"
+(defconst tramp-version "2.3.0"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -54,7 +54,7 @@
 ;; Check for Emacs version.
 (let ((x (if (>= emacs-major-version 23)
     "ok"
-  (format "Tramp 2.3.0-pre is not fit for %s"
+  (format "Tramp 2.3.0 is not fit for %s"
          (when (string-match "^.*$" (emacs-version))
            (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))