From: Michael Albinus Date: Fri, 15 Mar 2013 14:17:25 +0000 (+0100) Subject: Sync with Tramp 2.2.7. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~568^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2edd6029333fef68c7ab2cdbd6da0c877876883b;p=emacs.git Sync with Tramp 2.2.7. * net/trampver.el: Update release number. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ff63448d89..41e78c7885a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-03-15 Michael Albinus + + Sync with Tramp 2.2.7. + + * net/trampver.el: Update release number. + 2013-03-14 Tassilo Horn * doc-view.el Fix bug#13887. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index b346d085307..64053c202b7 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.7-pre" +(defconst tramp-version "2.2.7" "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.7 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x)))