From 418048bb52188a747acab6349a71c42c4ceebe2b Mon Sep 17 00:00:00 2001 From: John Shahid Date: Mon, 29 Apr 2019 16:10:47 -0400 Subject: [PATCH] Avoid infinitly looping in tramp-interrupt-process * 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. --- lisp/net/tramp.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 0a3129fd45..2aa62eba80 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4861,10 +4861,9 @@ tramp-interrupt-process (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) -- 2.21.0