Commit d0ebc389 authored by John Shahid's avatar John Shahid Committed by Michael Albinus

Avoid infinitly looping in tramp-interrupt-process (bug#35506)

* lisp/net/tramp.el (tramp-interrupt-process): Remove with-timeout.
Instead pass a timeout to tramp-accept-process-output.
tramp-accept-process-output stops timers from running which makes the
with-timeout ineffective.
parent 356fb18a
Pipeline #1670 failed with stage
in 50 minutes and 57 seconds
......@@ -4861,10 +4861,9 @@ Only works for Bourne-like shells."
(format "kill -2 -%d" pid))
;; Wait, until the process has disappeared. If it doesn't,
;; fall back to the default implementation.
(with-timeout (1 (ignore))
(while (tramp-accept-process-output proc))
;; Report success.
proc)))))
(and (tramp-accept-process-output proc 1)
;; Report success.
proc)))))
;; `interrupt-process-functions' exists since Emacs 26.1.
(when (boundp 'interrupt-process-functions)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment