[Emacs-diffs] master e68fe57: Sync with Tramp 2.3.0

[Michael Albinus]

branch: master
commit e68fe57c52a815a4289380a8bdd3eaa1b7e6dc88
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Sync with Tramp 2.3.0
    
    * doc/misc/trampver.texi:
    * lisp/net/trampver.el: Change version to "2.3.0".
---
 doc/misc/trampver.texi |    2 +-
 lisp/net/trampver.el   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index cdd008b..6f67f35 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.0-pre
address@hidden 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 64cc47e..aea2605 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -6,7 +6,7 @@
 ;; Author: Kai Großjohann <address@hidden>
 ;; 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)))