diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-02-16 18:23:00 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-02-16 18:23:00 +0100 |
| commit | dd7691b7f3d6149778a6d153288bc6c911a8cfc7 (patch) | |
| tree | 84bc01858b849645dd928c2e7bc07ca0105df6e7 /lisp/net/trampver.el | |
| parent | d34a353cfd51b01d00a9036240fb607bc502b8dc (diff) | |
| download | emacs-dd7691b7f3d6149778a6d153288bc6c911a8cfc7.tar.gz emacs-dd7691b7f3d6149778a6d153288bc6c911a8cfc7.tar.bz2 emacs-dd7691b7f3d6149778a6d153288bc6c911a8cfc7.zip | |
Sync with Tramp 2.2.9.
* doc/misc/trampver.texi: Update release number.
* lisp/net/trampver.el: Update release number.
* test/automated/tramp-tests.el (password-cache-expiry): Set to nil.
(tramp-test28-shell-command): Make a while loop when waiting for
process exit.
Diffstat (limited to 'lisp/net/trampver.el')
| -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 0052bafab5f..077aedb4d5f 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.9-pre" +(defconst tramp-version "2.2.9" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.9-pre is not fit for %s" + (format "Tramp 2.2.9 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) |