diff options
| -rw-r--r-- | lisp/net/tramp.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 2fdc651a372..1695eea06cc 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4570,14 +4570,14 @@ Only works for Bourne-like shells." 'tramp-send-command (tramp-get-connection-property proc "vector" nil) (format "kill -2 %d" pid)) - ;; Wait, until the process has disappeared. - (with-timeout - (1 (tramp-error proc 'error "Process %s did not interrupt" proc)) + ;; Wait, until the process has disappeared. If it doesn't, + ;; fall back to the default implementation. + (with-timeout (1 (ignore)) (while (process-live-p proc) ;; We cannot run `tramp-accept-process-output', it blocks timers. - (accept-process-output proc 0.1))) - ;; Report success. - proc)))) + (accept-process-output proc 0.1)) + ;; Report success. + proc))))) ;; `interrupt-process-functions' exists since Emacs 26.1. (when (boundp 'interrupt-process-functions) |