[Emacs-diffs] trunk r116453: Sync with Tramp 2.2.9.

[Michael Albinus]

------------------------------------------------------------
revno: 116453
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-16 18:23:00 +0100
message:
  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.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/trampver.texi         
trampver.texi-20091113204419-o5vbwnq5f7feedwu-6325
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/trampver.el           
trampver.el-20091113204419-o5vbwnq5f7feedwu-2564
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/tramp-tests.el  tramptests.el-20131105142319-d9zp3oprkpxj5v1e-1

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-02-16 14:52:43 +0000
+++ b/doc/misc/ChangeLog        2014-02-16 17:23:00 +0000
@@ -1,5 +1,9 @@
 2014-02-16  Michael Albinus  <address@hidden>
 
+       Sync with Tramp 2.2.9.
+
+       * trampver.texi: Update release number.
+
        * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2.
 
 2014-02-14  Jay Belanger  <address@hidden>

=== modified file 'doc/misc/trampver.texi'
--- a/doc/misc/trampver.texi    2014-01-01 07:43:34 +0000
+++ b/doc/misc/trampver.texi    2014-02-16 17:23:00 +0000
@@ -8,7 +8,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
address@hidden trampver 2.2.9-pre
address@hidden trampver 2.2.9
 
 @c Other flags from configuration
 @set instprefix /usr/local

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-16 04:15:47 +0000
+++ b/lisp/ChangeLog    2014-02-16 17:23:00 +0000
@@ -1,3 +1,9 @@
+2013-10-02  Michael Albinus  <address@hidden>
+
+       Sync with Tramp 2.2.9.
+
+       * net/trampver.el: Update release number.
+
 2014-02-16  Dmitry Gutov  <address@hidden>
 
        * ido.el (ido-file-internal): Don't add the name of an existing

=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el      2014-01-01 07:43:34 +0000
+++ b/lisp/net/trampver.el      2014-02-16 17:23:00 +0000
@@ -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)))

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-02-13 02:19:48 +0000
+++ b/test/ChangeLog    2014-02-16 17:23:00 +0000
@@ -1,3 +1,11 @@
+2014-02-16  Michael Albinus  <address@hidden>
+
+       Sync with Tramp 2.2.9.
+
+       * automated/tramp-tests.el (password-cache-expiry): Set to nil.
+       (tramp-test28-shell-command): Make a while loop when waiting for
+       process exit.
+
 2014-02-11  Michael Albinus  <address@hidden>
 
        * automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git'

=== modified file 'test/automated/tramp-tests.el'
--- a/test/automated/tramp-tests.el     2014-02-11 08:31:39 +0000
+++ b/test/automated/tramp-tests.el     2014-02-16 17:23:00 +0000
@@ -53,7 +53,8 @@
    (t (format "/ssh::%s" temporary-file-directory)))
   "Temporary directory for Tramp tests.")
 
-(setq tramp-verbose 0
+(setq password-cache-expiry nil
+      tramp-verbose 0
       tramp-message-show-message nil)
 
 ;; Disable interactive passwords in batch mode.
@@ -1175,7 +1176,10 @@
          (should (file-exists-p tmp-name))
           (async-shell-command
           (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer))
-         (sit-for 1 'nodisplay)
+         (while (ignore-errors
+                  (memq (process-status (get-buffer-process (current-buffer)))
+                        '(run open)))
+           (sit-for 1 'nodisplay))
          (should
           (string-equal
            (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))
@@ -1189,7 +1193,10 @@
          (process-send-string
           (get-buffer-process (current-buffer))
           (format "%s\n" (file-name-nondirectory tmp-name)))
-         (sit-for 1 'nodisplay)
+         (while (ignore-errors
+                  (memq (process-status (get-buffer-process (current-buffer)))
+                        '(run open)))
+           (sit-for 1 'nodisplay))
          (should
           (string-equal
            (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))