* 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 d748214959d20688be10e65a4bd1c63e7486cd45..f16d8c3634433a56c90bcf1e169d50608e491524 100644 (file)
--- 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 848599104c5107ed04a5424d4c4150681a2cdb71..a17bbfa0d14608e4bb893cce8d48dac6fb05c32e 100644 (file)
--- 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)