*** ~/src/tramp/lisp/tramp.el.~1~	Mon Sep 24 11:25:26 2007
--- ~/src/tramp/lisp/tramp.el	Mon Sep 24 11:25:27 2007
***************
*** 6042,6057 ****
      ;; tries to send some data to the remote end.  So that's why we
      ;; try to send a command from time to time, then look again
      ;; whether the process is really alive.
!     (when (and (> (tramp-time-diff
! 		   (current-time)
! 		   (tramp-get-connection-property p "last-cmd-time" '(0 0 0)))
! 		  60)
! 	       p (processp p) (memq (process-status p) '(run open)))
!       (tramp-send-command vec "echo are you awake" t t)
!       (unless (and (memq (process-status p) '(run open))
! 		   (tramp-wait-for-output p 10))
! 	(delete-process p)
! 	(setq p nil)))
  
      ;; New connection must be opened.
      (unless (and p (processp p) (memq (process-status p) '(run open)))
--- 6042,6064 ----
      ;; tries to send some data to the remote end.  So that's why we
      ;; try to send a command from time to time, then look again
      ;; whether the process is really alive.
!     (condition-case nil
! 	(when (and (> (tramp-time-diff
! 		       (current-time)
! 		       (tramp-get-connection-property
! 			p "last-cmd-time" '(0 0 0)))
! 		      60)
! 		   p (processp p) (memq (process-status p) '(run open)))
! 	  (tramp-send-command vec "echo are you awake" t t)
! 	  (unless (and (memq (process-status p) '(run open))
! 		       (tramp-wait-for-output p 10))
! 	    ;; The error will be catched locally.
! 	    (tramp-error vec 'file-error "Awake did fail")))
!       (file-error
!        (tramp-flush-connection-property vec nil)
!        (tramp-flush-connection-property p nil)
!        (delete-process p)
!        (setq p nil)))
  
      ;; New connection must be opened.
      (unless (and p (processp p) (memq (process-status p) '(run open)))