From: Tassilo Horn <tsdh@gnu.org>
Date: Tue, 8 Sep 2015 18:55:29 +0000 (+0200)
Subject: Fix double-reporting of rename events with inotify
X-Git-Tag: emacs-25.0.90~1224^2~190
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c825fd7cf94979a7f7c6777c985fd84024535905;p=emacs.git

Fix double-reporting of rename events with inotify

* lisp/filenotify.el (file-notify-callback): Fix double-reporting
of rename events with inotify (bug#21435).
---

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 5822cf0cc7e..4af9e90a35a 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -177,9 +177,9 @@ EVENT is the cadr of the event in `file-notify-handle-event'
                               (car file-notify--pending-event)))
                   ;; If the source is handled by another watch, we
                   ;; must fire the rename event there as well.
-                  (when (not (eq (file-notify--descriptor desc)
-                                 (file-notify--descriptor
-                                  (caar file-notify--pending-event))))
+                  (when (not (equal (file-notify--descriptor desc)
+                                    (file-notify--descriptor
+                                     (caar file-notify--pending-event))))
                     (setq pending-event
                           `((,(caar file-notify--pending-event)
                              renamed ,file ,file1)