* inotify.c (inotify_callback): Generate an Emacs event for every

incoming inotify event.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a2af0472a9f15c6f45fc18817dbe12cf55ca7a7..c8bf63fe4628e6afb884f9fbf7101da4f434376c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-11  Michael Albinus  <michael.albinus@gmx.de>
+
+       * inotify.c (inotify_callback): Generate an Emacs event for every
+       incoming inotify event.
+
 2012-12-11  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (handle_face_prop): Fix logic of computing

diff --git a/src/inotify.c b/src/inotify.c
index 17104c89064e77c0f63f75a59ef457d9a88b8e99..8a52c27985cf697dde49ec660aa70568eb450237 100644 (file)
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -172,7 +172,6 @@ inotify_callback (int fd, void *_)
 
   EVENT_INIT (event);
   event.kind = FILE_NOTIFY_EVENT;
-  event.arg = Qnil;
 
   i = 0;
   while (i < (size_t)n)
@@ -187,14 +186,14 @@ inotify_callback (int fd, void *_)
           /* If event was removed automatically: Drop it from watch list.  */
           if (ev->mask & IN_IGNORED)
             watch_list = Fdelete (watch_object, watch_list);
+
+         if (!NILP (event.arg))
+           kbd_buffer_store_event (&event);
         }
 
       i += sizeof (*ev) + ev->len;
     }
 
-  if (!NILP (event.arg))
-    kbd_buffer_store_event (&event);
-
   xfree (buffer);
 }