procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make tramp-interrupt-process more robust

Browse source 
* lisp/net/tramp.el (tramp-interrupt-process): Fall back to
the default implementation if there's no success.
This commit is contained in:
Michael Albinus 2017-12-11 09:36:23 +01:00
parent 5bcd468a9e
commit 6a6e8e6e8d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/net/tramp.el
View file

@ -4570,14 +4570,14 @@ Only works for Bourne-like shells."
'tramp-send-command 'tramp-send-command
(tramp-get-connection-property proc "vector" nil) (tramp-get-connection-property proc "vector" nil)
(format "kill -2 %d" pid)) (format "kill -2 %d" pid))
;; Wait, until the process has disappeared. ;; Wait, until the process has disappeared. If it doesn't,
(with-timeout ;; fall back to the default implementation.
(1 (tramp-error proc 'error "Process %s did not interrupt" proc)) (with-timeout (1 (ignore))
(while (process-live-p proc) (while (process-live-p proc)
;; We cannot run `tramp-accept-process-output', it blocks timers. ;; We cannot run `tramp-accept-process-output', it blocks timers.
(accept-process-output proc 0.1))) (accept-process-output proc 0.1))
;; Report success. ;; Report success.
proc)))) proc)))))
;; `interrupt-process-functions' exists since Emacs 26.1. ;; `interrupt-process-functions' exists since Emacs 26.1.
(when (boundp 'interrupt-process-functions) (when (boundp 'interrupt-process-functions)