From: Mattias Engdegård <mattiase@acm.org>
Date: Sat, 18 May 2019 17:48:32 +0000 (+0200)
Subject: Fix broken logic in file-notify
X-Git-Tag: emacs-27.0.90~2828
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3dcacb09a921593509d0975e4f6a9434a54521ae;p=emacs.git

Fix broken logic in file-notify

* lisp/filenotify.el (file-notify-callback):
Repair warped condition that didn't match rename-to/from events correctly.
---

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index a6054c175f1..26b83ce66c0 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -161,12 +161,14 @@ EVENT is the cadr of the event in `file-notify-handle-event'
       (while actions
         (let ((action (pop actions)))
           ;; Send pending event, if it doesn't match.
+          ;; We only handle {renamed,moved}-{from,to} pairs when these
+          ;; arrive in order without anything else in-between.
           (when (and file-notify--pending-event
-                     ;; The cookie doesn't match.
-                     (not (equal (file-notify--event-cookie
-                                  (car file-notify--pending-event))
-                                 (file-notify--event-cookie event)))
                      (or
+                      ;; The cookie doesn't match.
+                      (not (equal (file-notify--event-cookie
+                                   (car file-notify--pending-event))
+                                  (file-notify--event-cookie event)))
                       ;; inotify.
                       (and (eq (nth 1 (car file-notify--pending-event))
                                'moved-from)