diff options
| author | Sam Steingold | 2006-02-08 15:47:31 +0000 |
|---|---|---|
| committer | Sam Steingold | 2006-02-08 15:47:31 +0000 |
| commit | df2a9b125d690a972e6cd69af256352c6e400d92 (patch) | |
| tree | d7539ef25c212b28e195b3ab147a02d1cc1037b6 /lisp/net | |
| parent | 201a821a54684f1ed622ed4bdadf81bc85c79a75 (diff) | |
| download | emacs-df2a9b125d690a972e6cd69af256352c6e400d92.tar.gz emacs-df2a9b125d690a972e6cd69af256352c6e400d92.zip | |
(tramp-maybe-open-connection): Do not wait for output from a dead connection.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 3 |
1 files changed, 2 insertions, 1 deletions
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." | |||
| 6482 | p (processp p) (memq (process-status p) '(run open))) | 6482 | p (processp p) (memq (process-status p) '(run open))) |
| 6483 | (tramp-send-command | 6483 | (tramp-send-command |
| 6484 | multi-method method user host "echo are you awake" nil t) | 6484 | multi-method method user host "echo are you awake" nil t) |
| 6485 | (unless (tramp-wait-for-output 10) | 6485 | (unless (and (memq (process-status p) '(run open)) |
| 6486 | (tramp-wait-for-output 10)) | ||
| 6486 | (delete-process p) | 6487 | (delete-process p) |
| 6487 | (setq p nil)) | 6488 | (setq p nil)) |
| 6488 | (erase-buffer))) | 6489 | (erase-buffer))) |