Mercurial > emacs
diff lisp/net/tramp.el @ 90295:4b3d39451150
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 58-65)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 22-28)
- Update from CVS
- Merge from emacs--devo--0
- Update from CVS: lisp/gnus.el: Remove bogus comment.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 11 Feb 2006 00:11:19 +0000 |
parents | c5406394f567 74a3e3db0759 |
children | d57ee9eab157 |
line wrap: on
line diff
--- a/lisp/net/tramp.el Wed Feb 08 04:26:44 2006 +0000 +++ b/lisp/net/tramp.el Sat Feb 11 00:11:19 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)))