(tramp-maybe-open-connection): Do not wait for output from a dead connection.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64a1dcec7e207c9522055a4a6fe88d5bfbe8c919..c607ca350b2067ef14dd2b3888ac7f8b9c02b7ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08  Sam Steingold  <sds@gnu.org>
+
+       * net/tramp.el (tramp-maybe-open-connection): Do not wait for
+       output from a dead connection.
+
 2006-02-07  Mathias Dahl  <brakjoller@hotmail.com>
 
        * dired.el (dired-mode-map): Add more bindings for tumme.
@@ -351,7 +356,7 @@
        * international/latexenc.el: Add a suitable `coding:' tag.
        (latexenc-find-file-coding-system): Undo last change.
 
-2006-01-27  Arne J\e,bx\e(Brgensen  <arne@arnested.dk>
+2006-01-27  Arne J\e,Ax\e(Brgensen  <arne@arnested.dk>
 
        * international/latexenc.el (latexenc-find-file-coding-system):
        Make sure latexenc-main-file is a regular file and is readable.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2fdf63ce351a06c1d63c44f0c8f7e8a2b44418fc..afe5308a91825634f6cf434f8573fe09e51ad4d1 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6482,7 +6482,8 @@ connection if a previous connection has died for some reason."
                 p (processp p) (memq (process-status p) '(run open)))
        (tramp-send-command
         multi-method method user host "echo are you awake" nil t)
-       (unless (tramp-wait-for-output 10)
+       (unless (and (memq (process-status p) '(run open))
+                     (tramp-wait-for-output 10))
          (delete-process p)
          (setq p nil))
        (erase-buffer)))