diff options
Diffstat (limited to 'src/gfilenotify.c')
| -rw-r--r-- | src/gfilenotify.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gfilenotify.c b/src/gfilenotify.c index 14fcf7f4776..a9f33c99004 100644 --- a/src/gfilenotify.c +++ b/src/gfilenotify.c @@ -86,11 +86,11 @@ dir_monitor_callback (GFileMonitor *monitor, /* Check, whether event_type is expected. */ flags = XCAR (XCDR (XCDR (watch_object))); - if ((!NILP (Fmember (Qchange, flags)) && - !NILP (Fmember (symbol, list5 (Qchanged, Qchanges_done_hint, - Qdeleted, Qcreated, Qmoved)))) || - (!NILP (Fmember (Qattribute_change, flags)) && - ((EQ (symbol, Qattribute_changed))))) + if ((!NILP (Fmember (Qchange, flags)) + && !NILP (Fmember (symbol, list5 (Qchanged, Qchanges_done_hint, + Qdeleted, Qcreated, Qmoved)))) + || (!NILP (Fmember (Qattribute_change, flags)) + && EQ (symbol, Qattribute_changed))) { /* Construct an event. */ EVENT_INIT (event); @@ -108,9 +108,9 @@ 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)) + 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); } @@ -240,10 +240,10 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'. */) eassert (FIXNUMP (watch_descriptor)); GFileMonitor *monitor = XFIXNUMPTR (watch_descriptor); - if (!g_file_monitor_is_cancelled (monitor) && - !g_file_monitor_cancel (monitor)) - xsignal2 (Qfile_notify_error, build_string ("Could not rm watch"), - watch_descriptor); + if (!g_file_monitor_is_cancelled (monitor) + && !g_file_monitor_cancel (monitor)) + xsignal2 (Qfile_notify_error, build_string ("Could not rm watch"), + watch_descriptor); /* Remove watch descriptor from watch list. */ watch_list = Fdelq (watch_object, watch_list); |