summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/trampver.el4
2 files changed, 8 insertions, 2 deletions
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 <michael.albinus@gmx.de>
+
+ Sync with Tramp 2.2.7.
+
+ * net/trampver.el: Update release number.
+
2013-03-14 Tassilo Horn <tsdh@gnu.org>
* 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)))