summaryrefslogtreecommitdiff
path: root/lisp/net/trampver.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2015-06-28 20:51:54 +0200
committerMichael Albinus <michael.albinus@gmx.de>2015-06-28 20:51:54 +0200
commitfc0e567ff3d36597c7ba3312de18df45f27ed99d (patch)
tree5d0ee0d13884bccc9a4a650fcb1c10c506a55ecc /lisp/net/trampver.el
parent39e08cc354f13160093d280ba773acb08ee63ed3 (diff)
downloademacs-fc0e567ff3d36597c7ba3312de18df45f27ed99d.tar.gz
Sync with Tramp 2.2.12
* doc/misc/trampver.texi: * lisp/net/trampver.el: Update release number. * test/automated/tramp-tests.el (tramp-test13-make-directory): Fix cleanup.
Diffstat (limited to 'lisp/net/trampver.el')
-rw-r--r--lisp/net/trampver.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index eb22b6080be..beb040955e7 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.12-pre"
+(defconst tramp-version "2.2.12"
"This version of Tramp.")
;;;###tramp-autoload
@@ -58,7 +58,7 @@
(= emacs-major-version 21)
(>= emacs-minor-version 4)))
"ok"
- (format "Tramp 2.2.12-pre is not fit for %s"
+ (format "Tramp 2.2.12 is not fit for %s"
(when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x)))