[Emacs-diffs] /srv/bzr/emacs/trunk r105361: Sync with Tramp 2.2.2.

[Michael Albinus]

------------------------------------------------------------
revno: 105361
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-30 16:57:12 +0200
message:
  Sync with Tramp 2.2.2.
  
  * net/trampver.el: Update release number.
modified:
  lisp/ChangeLog
  lisp/net/trampver.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-30 09:14:58 +0000
+++ b/lisp/ChangeLog    2011-07-30 14:57:12 +0000
@@ -1,3 +1,9 @@
+2011-07-30  Michael Albinus  <address@hidden>
+
+       Sync with Tramp 2.2.2.
+
+       * net/trampver.el: Update release number.
+
 2011-07-30  Juri Linkov  <address@hidden>
 
        * dired-aux.el (dired-touch-initial): Remove function.

=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el      2011-04-25 18:10:17 +0000
+++ b/lisp/net/trampver.el      2011-07-30 14:57:12 +0000
@@ -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)))