3 files changed, 60 insertions, 36 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ac2299a4f79..584ee17cc1b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,63 @@
+2012-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+        Support for filesystem notifications on MS-Windows.
+        * w32proc.c (sys_select): If drain_message_queue returns non-zero,
+        and this is a TTY frame, signal the caller that keyboard input is
+        available.
+
+        * w32xfns.c (drain_message_queue): Now returns an int: an
+        indication whether any WM_EMACS_FILENOTIFY messages were found in
+        the queue.
+
+        * w32inevt.c (handle_file_notifications): New function.
+        (w32_console_read_socket): Call it to process file notifications.
+
+        * w32console.c (initialize_w32_display): Record the main thread ID
+        in dwMainThreadId.
+
+        * deps.mk (inotify.o): New dependency list.
+
+        * Makefile.in (SOME_MACHINE_OBJECTS): Add w32notify.o.
+
+        * w32term.h (WM_EMACS_FILENOTIFY): New custom message.
+        (WM_EMACS_END): Bump value by 1.
+        (notification_buffer_in_use, file_notifications)
+        (notifications_size, notifications_desc): Declare.
+        (w32_get_watch_object, lispy_file_action, globals_of_w32notify):
+        Add prototypes.
+
+        * w32term.c (lispy_file_action, queue_notifications): New functions.
+        (syms_of_w32term) <Qadded, Qremoved, Qmodified, Qrenamed_from>
+        <Qrenamed_to>: New symbols.
+        (w32_read_socket): Handle the WM_EMACS_FILENOTIFY message.
+
+        * w32notify.c: New file, implements file event notifications for
+        MS-Windows.
+
+        * w32fns.c (w32_wnd_proc): Handle the WM_EMACS_FILENOTIFY message
+        by posting it to the w32_read_socket queue.
+
+        * termhooks.h (enum event_kind) [HAVE_NTGUI]: Support
+        FILE_NOTIFY_EVENT.
+
+        * makefile.w32-in (OBJ2): Add $(BLD)/w32notify.$(O).
+        (GLOBAL_SOURCES): Add w32notify.c
+        ($(BLD)/w32notify.$(O)): New set of dependencies.
+
+        * lisp.h (syms_of_w32notify) [WINDOWSNT]: Add prototype.
+
+        * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Handle
+        FILE_NOTIFY_EVENT.
+        (syms_of_keyboard) [HAVE_NTGUI] <Qfile_notify>: New symbol.
+        (keys_of_keyboard) [WINDOWSNT]: Bind file-notify to
+        w32notify-handle-event by default.
+
+        * emacs.c (main) [WINDOWSNT]: Call globals_of_w32notify and
+        syms_of_w32notify.
+
 2012-12-10  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
+        Support for filesystem notifications on GNU/Linux via inotify.
         * termhooks.h (enum event_kind) [HAVE_INOTIFY]: Add
         FILE_NOTIFY_EVENT.
 
@@ -2168,40 +2226,6 @@
         (x_set_icon_name, ns_set_name, ns_set_name_as_filename):
         Remove ns_in_resize check.
 
-2012-10-07  Eli Zaretskii  <eliz@gnu.org>
-
-        * w32term.h (WM_EMACS_FILENOTIFY): New custom message.
-        (WM_EMACS_END): Bump value by 1.
-
-        * w32term.c (lispy_file_action, queue_notifications): New functions.
-        (syms_of_w32term) <Qadded, Qremoved, Qmodified, Qrenamed_from>
-        <Qrenamed_to>: New symbols.
-
-        * w32notify.c: New file, implement file event notifications for
-        MS-Windows.
-
-        * w32fns.c (w32_wnd_proc): Handle the WM_EMACS_FILENOTIFY message
-        by posting it to the w32_read_socket queue.
-
-        * termhooks.h (enum event_kind) [WINDOWSNT]: New event kind
-        FILE_NOTIFY_EVENT.
-
-        * makefile.w32-in (OBJ2): Add $(BLD)/w32notify.$(O).
-        (GLOBAL_SOURCES): Add w32notify.c
-        ($(BLD)/w32notify.$(O)): New set of dependencies.
-
-        * lisp.h (syms_of_w32notify) [WINDOWSNT]: Add prototype.
-
-        * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Handle
-        FILE_NOTIFY_EVENT.
-        (syms_of_keyboard) [WINDOWSNT] <Qfile_notify>: New symbol.
-        (keys_of_keyboard) [WINDOWSNT]: Bind file-notify to
-        w32notify-handle-event by default.
-
-        * emacs.c (main) [WINDOWSNT]: Call syms_of_w32notify.
-
-        * alloc.c (NSTATICS): Enlarge to 0x660.
-
 2012-10-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Improve sys_siglist detection.
diff --git a/src/deps.mk b/src/deps.mk
index c7316a24dad..beca5f7c6bc 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -128,6 +128,7 @@ image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
 indent.o: indent.c frame.h window.h indent.h buffer.h lisp.h $(config_h) \
    termchar.h termopts.h disptab.h region-cache.h character.h category.h \
    keyboard.h systime.h coding.h $(INTERVALS_H) globals.h
+inotify.o: inotify.c lisp.h coding.h process.h keyboard.h frame.h termhooks.h
 insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \
    atimer.h systime.h region-cache.h lisp.h globals.h $(config_h)
 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
diff --git a/src/termhooks.h b/src/termhooks.h
index 5e73127a699..1a261bacdc5 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -201,7 +201,6 @@ enum event_kind
      On X, the window manager seems to grab the keys it wants
      first, so this is not a problem there.  */
   , MULTIMEDIA_KEY_EVENT
-  , FILE_NOTIFY_EVENT
 #endif
 
 #ifdef HAVE_NS
@@ -212,7 +211,7 @@ enum event_kind
   , NS_NONKEY_EVENT
 #endif
 
-#ifdef HAVE_INOTIFY
+#if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI)
   /* File or directory was changed.  */
   , FILE_NOTIFY_EVENT
 #endif