From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 16 Feb 2014 17:23:00 +0000 (+0100)
Subject: Sync with Tramp 2.2.9.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~42
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd7691b7f3d6149778a6d153288bc6c911a8cfc7;p=emacs.git

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.
---

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 @@
 2014-02-16  Michael Albinus  <michael.albinus@gmx.de>
 
+	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  <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 @@
 @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.
-@set trampver 2.2.9-pre
+@set trampver 2.2.9
 
 @c Other flags from configuration
 @set instprefix /usr/local
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f2d7ddc7c4..7783f7fc424 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-02  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.2.9.
+
+	* net/trampver.el: Update release number.
+
 2014-02-16  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* ido.el (ido-file-internal): Don't add the name of an existing
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)))
diff --git a/test/ChangeLog b/test/ChangeLog
index a7bfa59ccfe..888c31d9ad0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-16  Michael Albinus  <michael.albinus@gmx.de>
+
+	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  <michael.albinus@gmx.de>
 
 	* automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git'
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 46540317e37..4aac9768a22 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -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 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	  (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 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	  (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))))