From: Michael Albinus Date: Mon, 20 Aug 2012 14:06:06 +0000 (+0200) Subject: * net/tramp.el (tramp-accept-process-output): Accept only output X-Git-Tag: emacs-24.2.90~590 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a32fbbcf262a71891032ef84f596bf5525f9124a;p=emacs.git * net/tramp.el (tramp-accept-process-output): Accept only output from PROC. Otherwise, process filters and sentinels might be confused. (Bug#12145) --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d748214959d..f16d8c36344 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-08-20 Michael Albinus + + * net/tramp.el (tramp-accept-process-output): Accept only output + from PROC. Otherwise, process filters and sentinels might be + confused. (Bug#12145) + 2012-08-20 Chong Yidong * descr-text.el (describe-text-properties-1): Use overlays-in to 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." ;; Under Windows XP, accept-process-output doesn't return ;; sometimes. So we add an additional timeout. (with-timeout ((or timeout 1)) - (accept-process-output proc timeout timeout-msecs))) + (accept-process-output proc timeout timeout-msecs (and proc t)))) (tramp-message proc 10 "\n%s" (buffer-string)))) (defun tramp-check-for-regexp (proc regexp)