Merge from origin/emacs-25

[gnu-emacs] / lisp / filenotify.el

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 21046a85a7a5ac9d86b0f40554e95ed0d872e792..61b6d240e6eada9c487a829241a013ecf9ab2101 100644 (file)
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -27,8 +27,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
+(require 'cl-lib)
 
 (defconst file-notify--library
   (cond
@@ -58,7 +57,7 @@ DESCRIPTOR should be an object returned by `file-notify-add-watch'.
 If it is registered in `file-notify-descriptors', a stopped event is sent."
   (let* ((desc (if (consp descriptor) (car descriptor) descriptor))
          (registered (gethash desc file-notify-descriptors))
-        (file (if (consp descriptor) (cdr descriptor) (caadr registered)))
+        (file (if (consp descriptor) (cdr descriptor) (cl-caadr registered)))
         (dir (car registered)))
 
     (when (consp registered)
@@ -104,7 +103,7 @@ It is a form ((DESCRIPTOR ACTION FILE [FILE1-OR-COOKIE]) CALLBACK).")
 Could be different from the directory watched by the backend library."
   (let* ((desc (if (consp (car event)) (caar event) (car event)))
          (registered (gethash desc file-notify-descriptors))
-        (file (if (consp (car event)) (cdar event) (caadr registered)))
+        (file (if (consp (car event)) (cdar event) (cl-caadr registered)))
         (dir (car registered)))
     (if file (expand-file-name file dir) dir)))
 
@@ -198,8 +197,10 @@ EVENT is the cadr of the event in `file-notify-handle-event'
                       '(attribute-changed changed created deleted renamed))
                action)
               ((memq action '(moved rename))
-               (setq file1 (file-notify--event-file1-name event))
-               'renamed)
+               ;; The kqueue rename event does not return file1 in
+               ;; case a file monitor is established.
+               (if (setq file1 (file-notify--event-file1-name event))
+                   'renamed 'deleted))
               ((eq action 'ignored)
                 (setq stopped t actions nil))
               ((memq action '(attrib link)) 'attribute-changed)
@@ -274,11 +275,13 @@ EVENT is the cadr of the event in `file-notify-handle-event'
             `(,(file-notify--descriptor desc (car entry)) ,action ,file))))
 
         ;; Send `stopped' event.
-        (when (and (memq action '(deleted renamed))
-                   ;; Not, when a file is backed up.
-                   (not (and (stringp file1) (backup-file-name-p file1)))
-                   ;; Watched file or directory is concerned.
-                   (string-equal file (file-notify--event-watched-file event)))
+        (when (or stopped
+                  (and (memq action '(deleted renamed))
+                       ;; Not, when a file is backed up.
+                       (not (and (stringp file1) (backup-file-name-p file1)))
+                       ;; Watched file or directory is concerned.
+                       (string-equal
+                        file (file-notify--event-watched-file event))))
           (file-notify-rm-watch (file-notify--descriptor desc (car entry))))))))
 
 ;; `kqueue', `gfilenotify' and `w32notify' return a unique descriptor