diff options
| author | Eli Zaretskii | 2013-11-28 21:40:15 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-11-28 21:40:15 +0200 |
| commit | 9c099ca7fd30b424b3e2f183652de888cd9b30b7 (patch) | |
| tree | 7823c33618b120f588addcfc4321eeeb4e4da901 /src/w32term.h | |
| parent | 16555151e0051faad2838505e80fcbd1f744cb9e (diff) | |
| download | emacs-9c099ca7fd30b424b3e2f183652de888cd9b30b7.tar.gz emacs-9c099ca7fd30b424b3e2f183652de888cd9b30b7.zip | |
Fix bug #15933 with crashes in file-notify-tests on MS-Windows.
Support w32 file notifications in batch mode.
src/w32proc.c (sys_select): Don't wait on interrupt_handle if it is
invalid (which happens in batch mode). If non-interactive, call
handle_file_notifications to store file notification events in the
input queue.
src/w32notify.c (send_notifications): Handle FRAME_INITIAL frames as
well.
src/w32inevt.c (handle_file_notifications): Now external, not
static.
src/w32term.h (handle_file_notifications): Provide prototype.
src/emacs.c (main) [HAVE_W32NOTIFY]: When non-interactive, call
init_crit, since init_display, which does that otherwise, is not
called.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/w32term.h b/src/w32term.h index b3c0cf56c7b..6825e3cd546 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -680,6 +680,7 @@ extern DWORD notifications_size; | |||
| 680 | extern void *notifications_desc; | 680 | extern void *notifications_desc; |
| 681 | extern Lisp_Object w32_get_watch_object (void *); | 681 | extern Lisp_Object w32_get_watch_object (void *); |
| 682 | extern Lisp_Object lispy_file_action (DWORD); | 682 | extern Lisp_Object lispy_file_action (DWORD); |
| 683 | extern int handle_file_notifications (struct input_event *); | ||
| 683 | 684 | ||
| 684 | extern void w32_initialize_display_info (Lisp_Object); | 685 | extern void w32_initialize_display_info (Lisp_Object); |
| 685 | extern void initialize_w32_display (struct terminal *, int *, int *); | 686 | extern void initialize_w32_display (struct terminal *, int *, int *); |