[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110923: * trampver.el:

[Michael Albinus]

------------------------------------------------------------
revno: 110923
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-11-20 10:29:47 +0100
message:
  * trampver.el:
  * trampver.texi: Downgrade version to 2.2.6-24.3, in order to
  distinguish from trunk.
  
  Don't merge with trunk, please.
modified:
  doc/misc/ChangeLog
  doc/misc/trampver.texi
  lisp/ChangeLog
  lisp/net/trampver.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-11-16 07:43:24 +0000
+++ b/doc/misc/ChangeLog        2012-11-20 09:29:47 +0000
@@ -1,3 +1,8 @@
+2012-11-20  Michael Albinus  <address@hidden>
+
+       * trampver.texi: Downgrade version to 2.2.6-24.3, in order to
+       distinguish from trunk.
+
 2012-11-16  Glenn Morris  <address@hidden>
 
        * cl.texi (Function Bindings): Clarify that cl-flet is lexical.

=== modified file 'doc/misc/trampver.texi'
--- a/doc/misc/trampver.texi    2012-10-09 12:51:21 +0000
+++ b/doc/misc/trampver.texi    2012-11-20 09:29:47 +0000
@@ -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.
address@hidden trampver 2.2.7-pre
address@hidden trampver 2.2.6-24.3
 
 @c Other flags from configuration
 @set instprefix /usr/local

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-19 20:57:36 +0000
+++ b/lisp/ChangeLog    2012-11-20 09:29:47 +0000
@@ -1,3 +1,8 @@
+2012-11-20  Michael Albinus  <address@hidden>
+
+       * net/trampver.el (tramp-version): Downgrade to 2.2.6-24.3, in
+       order to distinguish from trunk.
+
 2012-11-19  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/byte-run.el (defun-declarations-alist): Don't accept

=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el      2012-10-09 12:49:02 +0000
+++ b/lisp/net/trampver.el      2012-11-20 09:29:47 +0000
@@ -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)))