Sync with Tramp 2.2.2.

* net/trampver.el: Update release number.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5b5abc498acc6605321b08af9927ca10e0ca123..2f5c0e44550381911290430ad8e9e09110b7fd37 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.2.2.
+
+       * net/trampver.el: Update release number.
+
 2011-07-30  Juri Linkov  <juri@jurta.org>
 
        * dired-aux.el (dired-touch-initial): Remove function.

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 7b4c6fd75b135bfa411b5585c4eb143dbba1c4fd..da51662b2164bb3484cd32d733d24869d05930c0 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.2-pre"
+(defconst tramp-version "2.2.2"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                      (= emacs-major-version 21)
                      (>= emacs-minor-version 4)))
             "ok"
-          (format "Tramp 2.2.2-pre is not fit for %s"
+          (format "Tramp 2.2.2 is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))