From: Michael Albinus Date: Sat, 30 Jul 2011 14:57:12 +0000 (+0200) Subject: Sync with Tramp 2.2.2. X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~66^2~37 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c7ee4f39aabaeab09ffe5e1ab5d9ebba22652a6;p=emacs.git Sync with Tramp 2.2.2. * net/trampver.el: Update release number. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a5b5abc498a..2f5c0e44550 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-07-30 Michael Albinus + + Sync with Tramp 2.2.2. + + * net/trampver.el: Update release number. + 2011-07-30 Juri Linkov * dired-aux.el (dired-touch-initial): Remove function. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 7b4c6fd75b1..da51662b216 100644 --- 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)))