Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90294:c5406394f567 | 90295:4b3d39451150 |
---|---|
6480 (when (and tramp-last-cmd-time | 6480 (when (and tramp-last-cmd-time |
6481 (> (tramp-time-diff (current-time) tramp-last-cmd-time) 60) | 6481 (> (tramp-time-diff (current-time) tramp-last-cmd-time) 60) |
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))) |
6489 (unless (and p (processp p) (memq (process-status p) '(run open))) | 6490 (unless (and p (processp p) (memq (process-status p) '(run open))) |
6490 (when (and p (processp p)) | 6491 (when (and p (processp p)) |