[Emacs-diffs] /srv/bzr/emacs/trunk r107666: Fixes: debbugs:11080

[Andreas Schwab]

------------------------------------------------------------
revno: 107666
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2012-03-24 09:32:50 +0100
message:
  Fixes: debbugs:11080
  
  * xterm.c (XTread_socket): Only modify handling_signal if
  !SYNC_INPUT.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-23 12:32:23 +0000
+++ b/src/ChangeLog     2012-03-24 08:32:50 +0000
@@ -1,3 +1,8 @@
+2012-03-24  Andreas Schwab  <address@hidden>
+
+       * xterm.c (XTread_socket): Only modify handling_signal if
+       !SYNC_INPUT.  (Bug#11080)
+
 2012-03-23  Eli Zaretskii  <address@hidden>
 
        * bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-02-22 09:08:36 +0000
+++ b/src/xterm.c       2012-03-24 08:32:50 +0000
@@ -7099,7 +7099,8 @@
 
 
 /* Read events coming from the X server.
-   This routine is called by the SIGIO handler.
+   This routine is called by the SIGIO handler only if SYNC_INPUT is
+   not defined.
    We return as soon as there are no more events to be read.
 
    We return the number of characters stored into the buffer,
@@ -7133,7 +7134,9 @@
   /* So people can tell when we have read the available input.  */
   input_signal_count++;
 
+#ifndef SYNC_INPUT
   ++handling_signal;
+#endif
 
   /* For debugging, this gives a way to fake an I/O error.  */
   if (terminal->display_info.x == XTread_socket_fake_io_error)
@@ -7223,7 +7226,9 @@
       pending_autoraise_frame = 0;
     }
 
+#ifndef SYNC_INPUT
   --handling_signal;
+#endif
   UNBLOCK_INPUT;
 
   return count;