Fix watching directories using w32notify.c.

 src/w32notify.c (Fw32notify_add_watch): If the argument FILE is a
 directory, watch it and not its parent.
 (add_watch): Allow empty string in FILE.

 lisp/filenotify.el (file-notify-add-watch): Don't special-case
 w32notify when computing the directory to watch.

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50f587d1126..3ff0a40b2e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * filenotify.el (file-notify-add-watch): Don't special-case
+        w32notify when computing the directory to watch.
+
 2013-11-27  Glenn Morris  <rgm@gnu.org>
 
         Make bootstrap without generated uni-*.el files possible again.
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index c980d720714..72ee0ced785 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -237,8 +237,7 @@ FILE is the name of the file whose event is being reported."
 
   (let* ((handler (find-file-name-handler file 'file-notify-add-watch))
          (dir (directory-file-name
-               (if (or (and (not handler) (eq file-notify--library 'w32notify))
-                       (file-directory-p file))
+               (if (file-directory-p file)
                    file
                  (file-name-directory file))))
         desc func l-flags)