Mercurial > emacs

changeset 83059:af4a10a1bd55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert patch-93, that was the real culprit. Reapply patch-97. src/keyboard.c (read_avail_input): Don't BLOCK_INPUT. src/xterm.c (XTread_socket): Don't try to handle a new event if the input buffer is full. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-99
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 25 Feb 2004 03:29:37 +0000
parents 19323b99ddcc
children 70063cb10ca9
files src/keyboard.c src/xterm.c
diffstat 2 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Wed Feb 25 03:16:45 2004 +0000
+++ b/src/keyboard.c	Wed Feb 25 03:29:37 2004 +0000
@@ -6589,14 +6589,6 @@
   int err;
   struct display *d;
 
-  if (interrupt_input_blocked)
-    {
-      interrupt_input_pending = 1;
-      return -1;
-    }
-
-  BLOCK_INPUT;
-
   /* Loop through the available displays, and call their input hooks. */
   d = display_list;
   while (d)
@@ -6669,8 +6661,6 @@
   if (err && !nread)
     nread = -1;
 
-  UNBLOCK_INPUT;
-
   return nread;
 }
 
--- a/src/xterm.c	Wed Feb 25 03:16:45 2004 +0000
+++ b/src/xterm.c	Wed Feb 25 03:29:37 2004 +0000
@@ -7209,6 +7209,12 @@
 	{
           int finish;
 
+          if (numchars <= 1)
+            {
+              /* The input buffer is full; read the rest next time. */
+              break;
+            }
+
 	  XNextEvent (dpyinfo->display, &event);
 
 #ifdef HAVE_X_I18N