Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-660
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-661
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-662
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-663
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-664
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-665
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-666
   Fix read-only prompt problem in isearch

 * emacs@sv.gnu.org/emacs--devo--0--patch-667
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-668
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-669
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-670
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-671
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-672
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-673
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-206
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-207
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-208
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600

1 files changed, 5 insertions, 0 deletions

diff --git a/src/term.c b/src/term.c
index a12f982844c..dcbe3f88a16 100644
--- a/src/term.c
+++ b/src/term.c
@@ -47,6 +47,7 @@ Boston, MA 02110-1301, USA.  */
 #include "dispextern.h"
 #include "window.h"
 #include "keymap.h"
+#include "blockinput.h"
 #include "syssignal.h"
 #include "systty.h"
 
@@ -695,11 +696,13 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       conversion_buffer = encode_terminal_code (string, n, coding);
       if (coding->produced > 0)
         {
+          BLOCK_INPUT;
           fwrite (conversion_buffer, 1, coding->produced, tty->output);
           if (ferror (tty->output))
             clearerr (tty->output);
           if (tty->termscript)
             fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
+          UNBLOCK_INPUT;
         }
       len -= n;
       string += n;
@@ -781,11 +784,13 @@ tty_insert_glyphs (struct frame *f, struct glyph *start, int len)
 
       if (coding->produced > 0)
         {
+          BLOCK_INPUT;
           fwrite (conversion_buffer, 1, coding->produced, tty->output);
           if (ferror (tty->output))
             clearerr (tty->output);
           if (tty->termscript)
             fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
+          UNBLOCK_INPUT;
         }
 
       OUTPUT1_IF (tty, tty->TS_pad_inserted_char);