* trampver.el:

* trampver.texi: Downgrade version to 2.2.6-24.3, in order to
distinguish from trunk.

Don't merge with trunk, please.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4a3c8778e881155b9ab6e532602d89228561563c..d82d969982972dfc74b1f15e11a57b11d88a6c35 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20  Michael Albinus  <michael.albinus@gmx.de>
+
+       * trampver.texi: Downgrade version to 2.2.6-24.3, in order to
+       distinguish from trunk.
+
 2012-11-16  Glenn Morris  <rgm@gnu.org>
 
        * cl.texi (Function Bindings): Clarify that cl-flet is lexical.

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 96043a07300b20971ed4a189c5c2932ec789bfa3..b44f1df2a1efa5b6be8e568bb38de9edc6100f11 100644 (file)
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp CVS, 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.2.7-pre
+@set trampver 2.2.6-24.3
 
 @c Other flags from configuration
 @set instprefix /usr/local

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e9ed2502a7e12fba557ef079fbfc2515452279b..247222bde2100fbc96fd3be720878c875d3ffcfa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/trampver.el (tramp-version): Downgrade to 2.2.6-24.3, in
+       order to distinguish from trunk.
+
 2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/byte-run.el (defun-declarations-alist): Don't accept

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 331884691f455e2dbc8e85c1cfe5eea2ff5eaaec..2147f109de9b09979d5c2b23a5b627b75388ff14 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -31,7 +31,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.7-pre"
+(defconst tramp-version "2.2.6-24.3"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                      (= emacs-major-version 21)
                      (>= emacs-minor-version 4)))
             "ok"
-          (format "Tramp 2.2.7-pre is not fit for %s"
+          (format "Tramp 2.2.6-24.3 is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))