X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/47e9556c70a7009d7c750fd7bf10a0e6cf41cdce..f3aaca3552ba961d13cd1ee935c1c6b075f2398a:/src/gfilenotify.c
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 69f635d411..62b4efb0a3 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -1,5 +1,5 @@
/* Filesystem notifications support with glib API.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
+ Copyright (C) 2013-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -23,10 +23,8 @@ along with GNU Emacs. If not, see . */
#include
#include "lisp.h"
#include "coding.h"
-#include "frame.h"
#include "termhooks.h"
#include "keyboard.h"
-#include "process.h"
/* This is a list, elements are triples (DESCRIPTOR FILE FLAGS CALLBACK) */
@@ -112,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);
}