mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-23 18:47:57 +00:00
Code Issues Releases Activity

* keyboard.c (kbd_buffer_get_event): Read file notification events

Browse Source 
also in batch mode.

* xgselect.c (xg_select): Read glib events in any case, even if
there are no file descriptors to watch for.  (Bug#16519)
This commit is contained in:
Michael Albinus 2014-02-04 12:40:31 +01:00
parent 764ec9e5f0
commit 86d2bf4996
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2014-02-04 Michael Albinus <michael.albinus@gmx.de>
* keyboard.c (kbd_buffer_get_event): Read file notification events
also in batch mode.
* xgselect.c (xg_select): Read glib events in any case, even if
there are no file descriptors to watch for. (Bug#16519)
2014-02-03 Martin Rudalics <rudalics@gmx.at>
* dispextern.h (face_id): Add WINDOW_DIVIDER_FIRST_PIXEL_FACE_ID

4
src/keyboard.c
View File

@ -3820,7 +3820,7 @@ kbd_buffer_get_event (KBOARD **kbp,
}
#endif /* subprocesses */
#ifndef HAVE_DBUS /* We want to read D-Bus events in batch mode. */
#if !defined HAVE_DBUS && !defined USE_FILE_NOTIFY
if (noninteractive
/* In case we are running as a daemon, only do this before
detaching from the terminal. */
@ -3831,7 +3831,7 @@ kbd_buffer_get_event (KBOARD **kbp,
*kbp = current_kboard;
return obj;
}
#endif /* ! HAVE_DBUS */
#endif /* !defined HAVE_DBUS && !defined USE_FILE_NOTIFY */
/* Wait until there is input available. */
for (;;)

24
src/xgselect.c
View File

@ -124,23 +124,19 @@ xg_select (int fds_lim, fd_set *rfds, fd_set *wfds, fd_set *efds,
}
}
if (our_fds > 0 || (nfds == 0 && tmop == &tmo))
{
/* If Gtk+ is in use eventually gtk_main_iteration will be called,
unless retval is zero. */
/* If Gtk+ is in use eventually gtk_main_iteration will be called,
unless retval is zero. */
#ifdef USE_GTK
if (retval == 0)
if (retval == 0)
#endif
while (g_main_context_pending (context))
g_main_context_dispatch (context);
while (g_main_context_pending (context))
g_main_context_dispatch (context);
/* To not have to recalculate timeout, return like this. */
if (retval == 0)
{
retval = -1;
errno = EINTR;
}
/* To not have to recalculate timeout, return like this. */
if ((our_fds > 0 || (nfds == 0 && tmop == &tmo)) && (retval == 0))
{
retval = -1;
errno = EINTR;
}
return retval;