aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2019-03-04 00:04:46 -0800
committerPaul Eggert2019-03-04 00:05:04 -0800
commit96871766223e5904f84d46d37d014b15acdce11b (patch)
treec4afd1da85e0765196541ab2eb54502b524d9f7c /src
parent2f86095c360831e5ecf97d67f2960c8c5a336002 (diff)
downloademacs-96871766223e5904f84d46d37d014b15acdce11b.tar.gz
emacs-96871766223e5904f84d46d37d014b15acdce11b.zip
* src/gfilenotify.c: Fix indenting.
Diffstat (limited to 'src')
-rw-r--r--src/gfilenotify.c24
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,
86 86
87 /* Check, whether event_type is expected. */ 87 /* Check, whether event_type is expected. */
88 flags = XCAR (XCDR (XCDR (watch_object))); 88 flags = XCAR (XCDR (XCDR (watch_object)));
89 if ((!NILP (Fmember (Qchange, flags)) && 89 if ((!NILP (Fmember (Qchange, flags))
90 !NILP (Fmember (symbol, list5 (Qchanged, Qchanges_done_hint, 90 && !NILP (Fmember (symbol, list5 (Qchanged, Qchanges_done_hint,
91 Qdeleted, Qcreated, Qmoved)))) || 91 Qdeleted, Qcreated, Qmoved))))
92 (!NILP (Fmember (Qattribute_change, flags)) && 92 || (!NILP (Fmember (Qattribute_change, flags))
93 ((EQ (symbol, Qattribute_changed))))) 93 && EQ (symbol, Qattribute_changed)))
94 { 94 {
95 /* Construct an event. */ 95 /* Construct an event. */
96 EVENT_INIT (event); 96 EVENT_INIT (event);
@@ -108,9 +108,9 @@ dir_monitor_callback (GFileMonitor *monitor,
108 } 108 }
109 109
110 /* Cancel monitor if file or directory is deleted. */ 110 /* Cancel monitor if file or directory is deleted. */
111 if (!NILP (Fmember (symbol, list2 (Qdeleted, Qmoved))) && 111 if (!NILP (Fmember (symbol, list2 (Qdeleted, Qmoved)))
112 (strcmp (name, SSDATA (XCAR (XCDR (watch_object)))) == 0) && 112 && strcmp (name, SSDATA (XCAR (XCDR (watch_object)))) == 0
113 !g_file_monitor_is_cancelled (monitor)) 113 && !g_file_monitor_is_cancelled (monitor))
114 g_file_monitor_cancel (monitor); 114 g_file_monitor_cancel (monitor);
115 } 115 }
116 116
@@ -240,10 +240,10 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'. */)
240 240
241 eassert (FIXNUMP (watch_descriptor)); 241 eassert (FIXNUMP (watch_descriptor));
242 GFileMonitor *monitor = XFIXNUMPTR (watch_descriptor); 242 GFileMonitor *monitor = XFIXNUMPTR (watch_descriptor);
243 if (!g_file_monitor_is_cancelled (monitor) && 243 if (!g_file_monitor_is_cancelled (monitor)
244 !g_file_monitor_cancel (monitor)) 244 && !g_file_monitor_cancel (monitor))
245 xsignal2 (Qfile_notify_error, build_string ("Could not rm watch"), 245 xsignal2 (Qfile_notify_error, build_string ("Could not rm watch"),
246 watch_descriptor); 246 watch_descriptor);
247 247
248 /* Remove watch descriptor from watch list. */ 248 /* Remove watch descriptor from watch list. */
249 watch_list = Fdelq (watch_object, watch_list); 249 watch_list = Fdelq (watch_object, watch_list);