mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
Fix file notification problem on Windows.
* src/inotify.c (inotify_callback): Set event.frame_or_window to Qnil. * src/keyboard.c (make_lispy_event): Make a better check for the HAVE_W32NOTIFY case when creating a Qfile_notify event.
This commit is contained in:
parent
bb1c737531
commit
40e4394f87
2 changed files with 5 additions and 5 deletions
|
|
@ -339,6 +339,7 @@ inotify_callback (int fd, void *_)
|
||||||
struct input_event event;
|
struct input_event event;
|
||||||
EVENT_INIT (event);
|
EVENT_INIT (event);
|
||||||
event.kind = FILE_NOTIFY_EVENT;
|
event.kind = FILE_NOTIFY_EVENT;
|
||||||
|
event.frame_or_window = Qnil;
|
||||||
|
|
||||||
for (ssize_t i = 0; i < n; )
|
for (ssize_t i = 0; i < n; )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -7220,12 +7220,11 @@ make_lispy_event (struct input_event *event)
|
||||||
|
|
||||||
#ifdef USE_FILE_NOTIFY
|
#ifdef USE_FILE_NOTIFY
|
||||||
case FILE_NOTIFY_EVENT:
|
case FILE_NOTIFY_EVENT:
|
||||||
#ifdef HAVE_W32NOTIFY
|
|
||||||
/* Make an event (file-notify (DESCRIPTOR ACTION FILE) CALLBACK). */
|
/* Make an event (file-notify (DESCRIPTOR ACTION FILE) CALLBACK). */
|
||||||
return list3 (Qfile_notify, event->arg, event->frame_or_window);
|
if (!NILP (event->frame_or_window)) /* HAVE_W32NOTIFY */
|
||||||
#else
|
return list3 (Qfile_notify, event->arg, event->frame_or_window);
|
||||||
return Fcons (Qfile_notify, event->arg);
|
else
|
||||||
#endif
|
return Fcons (Qfile_notify, event->arg);
|
||||||
#endif /* USE_FILE_NOTIFY */
|
#endif /* USE_FILE_NOTIFY */
|
||||||
|
|
||||||
case SLEEP_EVENT:
|
case SLEEP_EVENT:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue