Mercurial > emacs
changeset 68726:74a3e3db0759
(tramp-maybe-open-connection): Do not wait for output from a dead connection.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Wed, 08 Feb 2006 15:47:31 +0000 |
| parents | e59bf34a8b21 |
| children | d842e198bb96 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 08 14:32:40 2006 +0000 +++ b/lisp/ChangeLog Wed Feb 08 15:47:31 2006 +0000 @@ -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.
--- a/lisp/net/tramp.el Wed Feb 08 14:32:40 2006 +0000 +++ b/lisp/net/tramp.el Wed Feb 08 15:47:31 2006 +0000 @@ -6482,7 +6482,8 @@ 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)))