procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xgselect.c (xg_select): Remove call to window_system_available

Browse source 
and g_main_context_pending at the top, so Gdk events (i.e. file
notify) are processed when Emacs is started with -nw.
This commit is contained in:
Jan Djärv 2013-06-08 10:48:52 +02:00
parent 1a312bf403
commit 5de0e01164
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2013-06-08 Jan Djärv <jan.h.d@swipnet.se>
* xgselect.c (xg_select): Remove call to window_system_available
and g_main_context_pending at the top, so Gdk events (i.e. file
notify) are processed when Emacs is started with -nw.
2013-06-07 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files.

10
src/xgselect.c
View file

@ -44,9 +44,13 @@ xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
int i, nfds, tmo_in_millisec;
USE_SAFE_ALLOCA;
if (! (window_system_available (NULL)
&& g_main_context_pending (context = g_main_context_default ())))
return pselect (fds_lim, rfds, wfds, efds, timeout, sigmask);
/* Do not try to optimize with an initial check with g_main_context_pending
and a call to pselect if it returns false. If Gdk has a timeout for 0.01
second, and Emacs has a timeout for 1 second, g_main_context_pending will
return false, but the timeout will be 1 second, thus missing the gdk
timeout with a lot. */
context = g_main_context_default ();
if (rfds) all_rfds = *rfds;
else FD_ZERO (&all_rfds);