Further fixes for kqueue.

* lisp/filenotify.el (file-notify-callback): Raise also event if
directory name matches.
(file-notify-add-watch): Add `create' to the flags for `kqueue'.

* src/kqueue.c (kqueue_generate_event): Use watch_object as
argument instead of ident.  Remove callback argument.  Adapt
callees.  Check actions whether they are monitored flags.

* test/automated/file-notify-tests.el (file-notify--test-library):
New defun.
(file-notify-test00-availability, file-notify-test02-events)
(file-notify-test04-file-validity)
(file-notify-test05-dir-validity): Use it.
(file-notify-test02-events, file-notify-test04-file-validity): Add
`read-event' calls between different file actions, in order to
give the backends a chance to rais an event.  Needed especially
for kqueue.  In case of deleting a directory, there are two
`deleted' events.

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index eb869cf66a9..5072bf414bf 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -258,6 +258,10 @@ EVENT is the cadr of the event in `file-notify-handle-event'
                     ;; File matches.
                     (string-equal
                      (nth 0 entry) (file-name-nondirectory file))
+                    ;; Directory matches.
+                    (string-equal
+                     (file-name-nondirectory file)
+                     (file-name-nondirectory (car registered)))
                     ;; File1 matches.
                     (and (stringp file1)
                          (string-equal
@@ -364,7 +368,7 @@ FILE is the name of the file whose event is being reported."
             ((eq file-notify--library 'inotify)
              '(create delete delete-self modify move-self move))
             ((eq file-notify--library 'kqueue)
-             '(delete write extend rename))
+             '(create delete write extend rename))
             ((eq file-notify--library 'w32notify)
              '(file-name directory-name size last-write-time)))))
         (when (memq 'attribute-change flags)