[Emacs-diffs] emacs-26 9e1b5bd 2/2: Improve tramp-interrupt-process robustness

[Michael Albinus]

branch: emacs-26
commit 9e1b5bd92ce26291c71ddb33a6291225e6ec1152
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Improve tramp-interrupt-process robustness
    
    * lisp/net/tramp.el (tramp-interrupt-process): Wait, until the
    process has disappeared.
---
 lisp/net/tramp.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 07c0680..abcd528 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4556,6 +4556,12 @@ 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))
+         (while (process-live-p proc)
+           ;; We cannot run `tramp-accept-process-output', it blocks timers.
+           (accept-process-output proc 0.1)))
        ;; Report success.
        proc))))