aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-03-15 15:17:25 +0100
committerMichael Albinus2013-03-15 15:17:25 +0100
commit2edd6029333fef68c7ab2cdbd6da0c877876883b (patch)
tree3ec9f3f6061d650fffe148c2d92213da3ade987c
parent5f795e34b35eb1c9374d41a784c654e6451d3670 (diff)
downloademacs-2edd6029333fef68c7ab2cdbd6da0c877876883b.tar.gz
emacs-2edd6029333fef68c7ab2cdbd6da0c877876883b.zip
Sync with Tramp 2.2.7.
* net/trampver.el: Update release number.
-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 @@
12013-03-15 Michael Albinus <michael.albinus@gmx.de>
2
3 Sync with Tramp 2.2.7.
4
5 * net/trampver.el: Update release number.
6
12013-03-14 Tassilo Horn <tsdh@gnu.org> 72013-03-14 Tassilo Horn <tsdh@gnu.org>
2 8
3 * doc-view.el Fix bug#13887. 9 * 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 @@
31;; should be changed only there. 31;; should be changed only there.
32 32
33;;;###tramp-autoload 33;;;###tramp-autoload
34(defconst tramp-version "2.2.7-pre" 34(defconst tramp-version "2.2.7"
35 "This version of Tramp.") 35 "This version of Tramp.")
36 36
37;;;###tramp-autoload 37;;;###tramp-autoload
@@ -44,7 +44,7 @@
44 (= emacs-major-version 21) 44 (= emacs-major-version 21)
45 (>= emacs-minor-version 4))) 45 (>= emacs-minor-version 4)))
46 "ok" 46 "ok"
47 (format "Tramp 2.2.7-pre is not fit for %s" 47 (format "Tramp 2.2.7 is not fit for %s"
48 (when (string-match "^.*$" (emacs-version)) 48 (when (string-match "^.*$" (emacs-version))
49 (match-string 0 (emacs-version))))))) 49 (match-string 0 (emacs-version)))))))
50 (unless (string-match "\\`ok\\'" x) (error "%s" x))) 50 (unless (string-match "\\`ok\\'" x) (error "%s" x)))