[Emacs-diffs] /srv/bzr/emacs/trunk r111802: Fix bug #13725 with file notifications on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111802
fixes bug: http://debbugs.gnu.org/13725
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-02-16 11:13:40 +0200
message:
  Fix bug #13725 with file notifications on MS-Windows.
  
   lisp/autorevert.el (auto-revert-notify-add-watch): With 'w32notify',
   add watch for the file, not its parent directory, since w32notify
   sets up the watch for the directory internally.
modified:
  lisp/ChangeLog
  lisp/autorevert.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-16 03:39:12 +0000
+++ b/lisp/ChangeLog    2013-02-16 09:13:40 +0000
@@ -1,3 +1,9 @@
+2013-02-16  Eli Zaretskii  <address@hidden>
+
+       * autorevert.el (auto-revert-notify-add-watch): With 'w32notify',
+       add watch for the file, not its parent directory, since w32notify
+       sets up the watch for the directory internally.  (Bug#13725)
+
 2013-02-16  Glenn Morris  <address@hidden>
 
        * image.el (image-default-frame-delay): New variable.

=== modified file 'lisp/autorevert.el'
--- a/lisp/autorevert.el        2013-01-30 19:20:46 +0000
+++ b/lisp/autorevert.el        2013-02-16 09:13:40 +0000
@@ -519,12 +519,13 @@
     (let ((func (if (fboundp 'inotify-add-watch)
                    'inotify-add-watch 'w32notify-add-watch))
          (aspect (if (fboundp 'inotify-add-watch)
-                     '(create modify moved-to) '(size last-write-time))))
+                     '(create modify moved-to) '(size last-write-time)))
+         (file (if (fboundp 'inotify-add-watch)
+                   (directory-file-name (expand-file-name default-directory))
+                 (buffer-file-name))))
       (setq auto-revert-notify-watch-descriptor
            (ignore-errors
-             (funcall
-              func (directory-file-name (expand-file-name default-directory))
-              aspect 'auto-revert-notify-handler)))
+             (funcall func file aspect 'auto-revert-notify-handler)))
       (if auto-revert-notify-watch-descriptor
          (progn
            (puthash