[Emacs-diffs] /srv/bzr/emacs/trunk r111192: * inotify.c (inotify_callback): Generate an Emacs event for every

[Michael Albinus]

------------------------------------------------------------
revno: 111192
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Tue 2012-12-11 17:29:13 +0100
message:
  * inotify.c (inotify_callback): Generate an Emacs event for every
  incoming inotify event.
modified:
  src/ChangeLog
  src/inotify.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-11 12:22:35 +0000
+++ b/src/ChangeLog     2012-12-11 16:29:13 +0000
@@ -1,3 +1,8 @@
+2012-12-11  Michael Albinus  <address@hidden>
+
+       * inotify.c (inotify_callback): Generate an Emacs event for every
+       incoming inotify event.
+
 2012-12-11  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (handle_face_prop): Fix logic of computing

=== modified file 'src/inotify.c'
--- a/src/inotify.c     2012-12-11 08:24:09 +0000
+++ b/src/inotify.c     2012-12-11 16:29:13 +0000
@@ -172,7 +172,6 @@
 
   EVENT_INIT (event);
   event.kind = FILE_NOTIFY_EVENT;
-  event.arg = Qnil;
 
   i = 0;
   while (i < (size_t)n)
@@ -187,14 +186,14 @@
           /* 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);
 }