[Emacs-diffs] emacs/src keyboard.c

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/02/01 16:32:26

Modified files:
        src            : keyboard.c 

Log message:
        * nsterm.m (ns_read_socket): Copy 2009-01-29 and 2009-01-30
        XT,w32read_socket changes to ns_read_socket.
        * keyboard.c (handle_interrupt): Don't call
        quit_throw_to_read_char() under NS.
        * blockinput.h: Remove NS-specific code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.993&r2=1.994

Patches:
Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -b -r1.993 -r1.994
--- keyboard.c  30 Jan 2009 13:06:09 -0000      1.993
+++ keyboard.c  1 Feb 2009 16:32:26 -0000       1.994
@@ -11125,8 +11125,17 @@
        Vquit_flag = Qt;
     }
 
+/* TODO: The longjmp in this call throws the NS event loop integration off,
+         and it seems to do fine without this.  Probably some attention
+        needs to be paid to the setting of waiting_for_input in
+         wait_reading_process_output() under HAVE_NS because of the call
+         to ns_select there (needed because otherwise events aren't picked up
+         outside of polling since we don't get SIGIO like X and we don't have a
+         separate event loop thread like W32. */
+#ifndef HAVE_NS
   if (waiting_for_input && !echoing)
       quit_throw_to_read_char ();
+#endif
 }
 
 /* Handle a C-g by making read_char return C-g.  */
@@ -11183,7 +11192,7 @@
 #endif /* NO_SOCK_SIGIO */
     }
   else
-#endif
+#endif /* HAVE_X_WINDOWS */
     new_interrupt_input = !NILP (interrupt);
 #else /* not SIGIO */
   new_interrupt_input = 0;