2 files changed, 7 insertions, 1 deletions

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  <michael.albinus@gmx.de>
+
+        * 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  <cyd@gnu.org>
 
         * 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)