diff options
| author | Michael Albinus | 2015-06-28 20:51:54 +0200 |
|---|---|---|
| committer | Michael Albinus | 2015-06-28 20:51:54 +0200 |
| commit | fc0e567ff3d36597c7ba3312de18df45f27ed99d (patch) | |
| tree | 5d0ee0d13884bccc9a4a650fcb1c10c506a55ecc /lisp | |
| parent | 39e08cc354f13160093d280ba773acb08ee63ed3 (diff) | |
| download | emacs-fc0e567ff3d36597c7ba3312de18df45f27ed99d.tar.gz emacs-fc0e567ff3d36597c7ba3312de18df45f27ed99d.zip | |
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')
| -rw-r--r-- | lisp/net/trampver.el | 4 |
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 @@ | |||
| 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.12-pre" | 34 | (defconst tramp-version "2.2.12" |
| 35 | "This version of Tramp.") | 35 | "This version of Tramp.") |
| 36 | 36 | ||
| 37 | ;;;###tramp-autoload | 37 | ;;;###tramp-autoload |
| @@ -58,7 +58,7 @@ | |||
| 58 | (= emacs-major-version 21) | 58 | (= emacs-major-version 21) |
| 59 | (>= emacs-minor-version 4))) | 59 | (>= emacs-minor-version 4))) |
| 60 | "ok" | 60 | "ok" |
| 61 | (format "Tramp 2.2.12-pre is not fit for %s" | 61 | (format "Tramp 2.2.12 is not fit for %s" |
| 62 | (when (string-match "^.*$" (emacs-version)) | 62 | (when (string-match "^.*$" (emacs-version)) |
| 63 | (match-string 0 (emacs-version))))))) | 63 | (match-string 0 (emacs-version))))))) |
| 64 | (unless (string-match "\\`ok\\'" x) (error "%s" x))) | 64 | (unless (string-match "\\`ok\\'" x) (error "%s" x))) |