[Emacs-diffs] emacs/src ChangeLog atimer.c keyboard.c w32inev...

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/01/30 13:06:11

Modified files:
        src            : ChangeLog atimer.c keyboard.c w32inevt.c 
                         w32term.c xterm.c 

Log message:
        * atimer.c (run_timers, alarm_signal_handler):
        * keyboard.c (pending_signals, handle_async_input, init_keyboard):
        * w32inevt.c (w32_console_read_socket):
        * w32term.c (w32_read_socket):
        * xterm.c (XTread_socket): Use "#ifdef SYNC_INPUT" where appropriate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7327&r2=1.7328
http://cvs.savannah.gnu.org/viewcvs/emacs/src/atimer.c?cvsroot=emacs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.992&r2=1.993
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32inevt.c?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32term.c?cvsroot=emacs&r1=1.318&r2=1.319
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1021&r2=1.1022

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7327
retrieving revision 1.7328
diff -u -b -r1.7327 -r1.7328
--- ChangeLog   30 Jan 2009 05:15:34 -0000      1.7327
+++ ChangeLog   30 Jan 2009 13:06:07 -0000      1.7328
@@ -1,3 +1,11 @@
+2009-01-30  Juanma Barranquero  <address@hidden>
+
+       * atimer.c (run_timers, alarm_signal_handler):
+       * keyboard.c (pending_signals, handle_async_input, init_keyboard):
+       * w32inevt.c (w32_console_read_socket):
+       * w32term.c (w32_read_socket):
+       * xterm.c (XTread_socket): Use "#ifdef SYNC_INPUT" where appropriate.
+
 2009-01-30  Chong Yidong  <address@hidden>
 
        * callproc.c (Vtemp_file_name_pattern): Remove DEFVAR_LISP.

Index: atimer.c
===================================================================
RCS file: /sources/emacs/emacs/src/atimer.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- atimer.c    29 Jan 2009 14:33:14 -0000      1.30
+++ atimer.c    30 Jan 2009 13:06:09 -0000      1.31
@@ -384,6 +384,7 @@
       EMACS_GET_TIME (now);
     }
 
+#ifdef SYNC_INPUT
   if (pending_atimers)
     pending_signals = 1;
   else
@@ -391,6 +392,10 @@
       pending_signals = interrupt_input_pending;
       set_alarm ();
     }
+#else
+  if (! pending_atimers)
+    set_alarm ();
+#endif
 }
 
 
@@ -402,8 +407,9 @@
      int signo;
 {
   pending_atimers = 1;
+#ifdef SYNC_INPUT
   pending_signals = 1;
-#ifndef SYNC_INPUT
+#else
   run_timers ();
 #endif
 }

Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -b -r1.992 -r1.993
--- keyboard.c  29 Jan 2009 14:34:16 -0000      1.992
+++ keyboard.c  30 Jan 2009 13:06:09 -0000      1.993
@@ -96,7 +96,9 @@
    pending_atimers separately, to reduce code size.  So, any code that
    changes interrupt_input_pending or pending_atimers should update
    this too.  */
+#ifdef SYNC_INPUT
 int pending_signals;
+#endif
 
 #define KBD_BUFFER_SIZE 4096
 
@@ -7271,7 +7273,9 @@
 handle_async_input ()
 {
   interrupt_input_pending = 0;
+#ifdef SYNC_INPUT
   pending_signals = pending_atimers;
+#endif
 
   while (1)
     {
@@ -11556,7 +11560,9 @@
   input_pending = 0;
   interrupt_input_blocked = 0;
   interrupt_input_pending = 0;
+#ifdef SYNC_INPUT
   pending_signals = 0;
+#endif
 
   /* This means that command_loop_1 won't try to select anything the first
      time through.  */

Index: w32inevt.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32inevt.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- w32inevt.c  29 Jan 2009 14:35:14 -0000      1.45
+++ w32inevt.c  30 Jan 2009 13:06:10 -0000      1.46
@@ -651,12 +651,16 @@
   if (interrupt_input_blocked)
     {
       interrupt_input_pending = 1;
+#ifdef SYNC_INPUT
       pending_signals = 1;
+#endif
       return -1;
     }
 
   interrupt_input_pending = 0;
+#ifdef SYNC_INPUT
   pending_signals = pending_atimers;
+#endif
   BLOCK_INPUT;
 
   for (;;)

Index: w32term.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32term.c,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -b -r1.318 -r1.319
--- w32term.c   29 Jan 2009 14:35:04 -0000      1.318
+++ w32term.c   30 Jan 2009 13:06:10 -0000      1.319
@@ -4078,12 +4078,16 @@
   if (interrupt_input_blocked)
     {
       interrupt_input_pending = 1;
+#ifdef SYNC_INPUT
       pending_signals = 1;
+#endif
       return -1;
     }
 
   interrupt_input_pending = 0;
+#ifdef SYNC_INPUT
   pending_signals = pending_atimers;
+#endif
   BLOCK_INPUT;
 
   /* So people can tell when we have read the available input.  */

Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1021
retrieving revision 1.1022
diff -u -b -r1.1021 -r1.1022
--- xterm.c     29 Jan 2009 14:34:52 -0000      1.1021
+++ xterm.c     30 Jan 2009 13:06:10 -0000      1.1022
@@ -7138,12 +7138,16 @@
   if (interrupt_input_blocked)
     {
       interrupt_input_pending = 1;
+#ifdef SYNC_INPUT
       pending_signals = 1;
+#endif
       return -1;
     }
 
   interrupt_input_pending = 0;
+#ifdef SYNC_INPUT
   pending_signals = pending_atimers;
+#endif
   BLOCK_INPUT;
 
   /* So people can tell when we have read the available input.  */