diff options
| author | Michael Albinus | 2014-02-16 18:23:00 +0100 |
|---|---|---|
| committer | Michael Albinus | 2014-02-16 18:23:00 +0100 |
| commit | dd7691b7f3d6149778a6d153288bc6c911a8cfc7 (patch) | |
| tree | 84bc01858b849645dd928c2e7bc07ca0105df6e7 /doc | |
| parent | d34a353cfd51b01d00a9036240fb607bc502b8dc (diff) | |
| download | emacs-dd7691b7f3d6149778a6d153288bc6c911a8cfc7.tar.gz 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 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/trampver.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a238483772d..6b80433b670 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2014-02-16 Michael Albinus <michael.albinus@gmx.de> | 1 | 2014-02-16 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 2 | ||
| 3 | Sync with Tramp 2.2.9. | ||
| 4 | |||
| 5 | * trampver.texi: Update release number. | ||
| 6 | |||
| 3 | * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2. | 7 | * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2. |
| 4 | 8 | ||
| 5 | 2014-02-14 Jay Belanger <jay.p.belanger@gmail.com> | 9 | 2014-02-14 Jay Belanger <jay.p.belanger@gmail.com> |
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index fe91fc893fc..ece9e5fc2a4 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | @c In the Tramp CVS, the version number is auto-frobbed from | 8 | @c In the Tramp CVS, the version number is auto-frobbed from |
| 9 | @c configure.ac, so you should edit that file and run | 9 | @c configure.ac, so you should edit that file and run |
| 10 | @c "autoconf && ./configure" to change the version number. | 10 | @c "autoconf && ./configure" to change the version number. |
| 11 | @set trampver 2.2.9-pre | 11 | @set trampver 2.2.9 |
| 12 | 12 | ||
| 13 | @c Other flags from configuration | 13 | @c Other flags from configuration |
| 14 | @set instprefix /usr/local | 14 | @set instprefix /usr/local |