aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2016-12-30 20:04:33 +0100
committerMichael Albinus2016-12-30 20:04:33 +0100
commitaef40049e3b81972703d3bde47b0961bcb08d7e1 (patch)
tree461422f149c64ad8fe2e166b4e229f18fec3d2e8 /src
parent83cc8a19b45cb2279c128b781e79d81bb91aac58 (diff)
downloademacs-aef40049e3b81972703d3bde47b0961bcb08d7e1.tar.gz
emacs-aef40049e3b81972703d3bde47b0961bcb08d7e1.zip
* src/gfilenotify.c (Fgfile_monitor_name): Return a symbol.
Diffstat (limited to 'src')
-rw-r--r--src/gfilenotify.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 1ad989a0d95..18ccfe4c462 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -281,8 +281,8 @@ invalid. */)
281DEFUN ("gfile-monitor-name", Fgfile_monitor_name, Sgfile_monitor_name, 1, 1, 0, 281DEFUN ("gfile-monitor-name", Fgfile_monitor_name, Sgfile_monitor_name, 1, 1, 0,
282 doc: /* Return the internal monitor name for WATCH-DESCRIPTOR. 282 doc: /* Return the internal monitor name for WATCH-DESCRIPTOR.
283 283
284The result is a string, either "GInotifyFileMonitor", 284The result is a symbol, either `GInotifyFileMonitor',
285"GKqueueFileMonitor", or "GPollFileMonitor". 285`GKqueueFileMonitor', `GFamFileMonitor', or `GPollFileMonitor'.
286 286
287WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'. 287WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'.
288If WATCH-DESCRIPTOR is not valid, nil is returned. */) 288If WATCH-DESCRIPTOR is not valid, nil is returned. */)
@@ -292,9 +292,8 @@ If WATCH-DESCRIPTOR is not valid, nil is returned. */)
292 return Qnil; 292 return Qnil;
293 else 293 else
294 { 294 {
295 Lisp_Object watch_object = Fassoc (watch_descriptor, watch_list);
296 GFileMonitor *monitor = XINTPTR (watch_descriptor); 295 GFileMonitor *monitor = XINTPTR (watch_descriptor);
297 return build_string (G_OBJECT_TYPE_NAME (monitor)); 296 return Fmake_symbol (build_string (G_OBJECT_TYPE_NAME (monitor)));
298 } 297 }
299} 298}
300 299