[Emacs-diffs] /srv/bzr/emacs/trunk r108249: * xgselect.c (xg_select): Just invoke 'select' if -nw.

[Paul Eggert]

------------------------------------------------------------
revno: 108249
fixes bug(s): http://debbugs.gnu.org/9754
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-15 19:22:53 -0700
message:
  * xgselect.c (xg_select): Just invoke 'select' if -nw.
  
  Suggested by Ken Brown.
modified:
  src/ChangeLog
  src/xgselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-15 20:20:18 +0000
+++ b/src/ChangeLog     2012-05-16 02:22:53 +0000
@@ -1,3 +1,7 @@
+2012-05-16  Paul Eggert  <address@hidden>
+
+       * xgselect.c (xg_select): Just invoke 'select' if -nw (Bug#9754).
+
 2012-05-15  Stefan Monnier  <address@hidden>
 
        * lread.c (init_obarray): Declare Qt and Qnil as special.

=== modified file 'src/xgselect.c'
--- a/src/xgselect.c    2012-05-10 05:27:24 +0000
+++ b/src/xgselect.c    2012-05-16 02:22:53 +0000
@@ -38,17 +38,21 @@
   SELECT_TYPE all_rfds, all_wfds;
   EMACS_TIME tmo, *tmop = timeout;
 
-  GMainContext *context = g_main_context_default ();
+  GMainContext *context;
   int have_wfds = wfds != NULL;
   int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;
   int i, nfds, fds_lim, tmo_in_millisec;
 
+  if (inhibit_window_system || !display_arg)
+    return select (max_fds, rfds, wfds, efds, timeout);
+
   if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
   else FD_ZERO (&all_rfds);
   if (wfds) memcpy (&all_wfds, wfds, sizeof (all_rfds));
   else FD_ZERO (&all_wfds);
 
   /* Update event sources in GLib. */
+  context = g_main_context_default ();
   g_main_context_pending (context);
 
   do {