mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

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

Browse Source 
* 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.
This commit is contained in:
John Shahid 2019-05-15 16:29:58 +02:00 committed by Michael Albinus
parent 356fb18a1f
commit d0ebc389eb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/net/tramp.el
View File

@ -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)