mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Code Issues Projects Releases Wiki Activity

* xgselect.c (xg_select): Just invoke 'select' if -nw.

Browse source 
Suggested by Ken Brown.

Fixes: debbugs:9754
This commit is contained in:
Paul Eggert 2012-05-15 19:22:53 -07:00
parent 1a72a195d0
commit b05725233b
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-16 Paul Eggert <eggert@cs.ucla.edu>
* xgselect.c (xg_select): Just invoke 'select' if -nw (Bug#9754).
2012-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
* lread.c (init_obarray): Declare Qt and Qnil as special.

6
src/xgselect.c
View file

@ -38,17 +38,21 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
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 {