diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-06-15 11:33:16 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-15 11:33:16 +0200 |
| commit | 38a86a4c490348e74ad1c395ad66176f15d1ce20 (patch) | |
| tree | cc143f6ddf6bba4b8cf72b26aa9326979acf81c4 /lisp/net | |
| parent | 7d71d0b13d311f60183358a1df696652785f97dc (diff) | |
| download | emacs-38a86a4c490348e74ad1c395ad66176f15d1ce20.tar.gz | |
Some changes in process output read of Tramp
* lisp/net/tramp.el (tramp-handle-file-notify-rm-watch):
Read pending output.
* test/lisp/net/tramp-tests.el (tramp-test31-interrupt-process):
Use a timeout when reading process output.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 76eb03b89e0..5086ceb9f3b 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3865,6 +3865,8 @@ of." ;; The descriptor must be a process object. (unless (processp proc) (tramp-error proc 'file-notify-error "Not a valid descriptor %S" proc)) + ;; There might be pending output. + (while (tramp-accept-process-output proc 0)) (tramp-message proc 6 "Kill %S" proc) (delete-process proc)) |