diff options
| author | Michael Albinus | 2012-08-20 16:06:06 +0200 |
|---|---|---|
| committer | Michael Albinus | 2012-08-20 16:06:06 +0200 |
| commit | a32fbbcf262a71891032ef84f596bf5525f9124a (patch) | |
| tree | 9e65d5c4dfd7a089b4cbb4fd35835a17c1f98024 /lisp/net | |
| parent | a05731a0cc2553af0469bd9b7d6ac10cd2e6a817 (diff) | |
| download | emacs-a32fbbcf262a71891032ef84f596bf5525f9124a.tar.gz emacs-a32fbbcf262a71891032ef84f596bf5525f9124a.zip | |
* net/tramp.el (tramp-accept-process-output): Accept only output
from PROC. Otherwise, process filters and sentinels might be
confused. (Bug#12145)
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 848599104c5..a17bbfa0d14 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -3293,7 +3293,7 @@ for process communication also." | |||
| 3293 | ;; Under Windows XP, accept-process-output doesn't return | 3293 | ;; Under Windows XP, accept-process-output doesn't return |
| 3294 | ;; sometimes. So we add an additional timeout. | 3294 | ;; sometimes. So we add an additional timeout. |
| 3295 | (with-timeout ((or timeout 1)) | 3295 | (with-timeout ((or timeout 1)) |
| 3296 | (accept-process-output proc timeout timeout-msecs))) | 3296 | (accept-process-output proc timeout timeout-msecs (and proc t)))) |
| 3297 | (tramp-message proc 10 "\n%s" (buffer-string)))) | 3297 | (tramp-message proc 10 "\n%s" (buffer-string)))) |
| 3298 | 3298 | ||
| 3299 | (defun tramp-check-for-regexp (proc regexp) | 3299 | (defun tramp-check-for-regexp (proc regexp) |