[Emacs-diffs] /srv/bzr/emacs/trunk r109699: * net/tramp.el (tramp-accept-process-output): Accept only output

[Michael Albinus]

------------------------------------------------------------
revno: 109699
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Mon 2012-08-20 16:06:06 +0200
message:
  * net/tramp.el (tramp-accept-process-output): Accept only output
  from PROC.  Otherwise, process filters and sentinels might be
  confused.  (Bug#12145)
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-20 11:12:16 +0000
+++ b/lisp/ChangeLog    2012-08-20 14:06:06 +0000
@@ -1,3 +1,9 @@
+2012-08-20  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * descr-text.el (describe-text-properties-1): Use overlays-in to

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2012-08-15 16:29:11 +0000
+++ b/lisp/net/tramp.el 2012-08-20 14:06:06 +0000
@@ -3293,7 +3293,7 @@
       ;; 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)