From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 3 Nov 2015 17:17:53 +0000 (+0100)
Subject: Fix a stupid error in gfilenotify.c.
X-Git-Tag: emacs-25.0.90~931
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=436ed2399ade5c41b8ed3cffe177fb5210eff574;p=emacs.git

Fix a stupid error in gfilenotify.c.

* src/gfilenotify.c (dir_monitor_callback): Cancel monitor only,
if we've got a `deleted' signal AND the file name is the watched one.
---

diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 2057f885300..8660f415e2f 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -110,6 +110,7 @@ dir_monitor_callback (GFileMonitor *monitor,
 
       /* Cancel monitor if file or directory is deleted.  */
       if (!NILP (Fmember (symbol, list2 (Qdeleted, Qmoved))) &&
+	  (strcmp (name, SSDATA (XCAR (XCDR (watch_object)))) == 0) &&
 	  !g_file_monitor_is_cancelled (monitor))
 	g_file_monitor_cancel (monitor);
     }