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

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64a1dcec7e2..c607ca350b2 100644
--- 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,bx(Brgensen  <arne@arnested.dk>
+2006-01-27  Arne J,Ax(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 2fdf63ce351..afe5308a918 100644
--- 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)))