diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2015-09-22 08:40:08 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2015-09-22 08:40:08 +0200 |
commit | 170ed29b438ed0d9f31f1cd1f2f6d9808540763d (patch) | |
tree | dd93c9b19aff65f669db27c11318a98d1a3aecd4 /lisp/filenotify.el | |
parent | 27f871907cc24f33a7d12ac3a4ab71a88f0bc554 (diff) | |
download | emacs-170ed29b438ed0d9f31f1cd1f2f6d9808540763d.tar.gz emacs-170ed29b438ed0d9f31f1cd1f2f6d9808540763d.tar.bz2 emacs-170ed29b438ed0d9f31f1cd1f2f6d9808540763d.zip |
Implement gfile-valid-p
* lisp/filenotify.el (file-notify-callback): Fix typo.
(gfile-valid-p): Remove defalias.
* src/gfilenotify.c (dir_monitor_callback): Cancel the monitor if
the file or directory to be watched is deleted.
(Fgfile_add_watch): Make watch_object a triple.
(Fgfile_rm_watch): Check, whether watch is cancelled already.
(Fgfile_valid_p): New defun.
(syms_of_gfilenotify): Declare Sgfile_valid_p.
Diffstat (limited to 'lisp/filenotify.el')
-rw-r--r-- | lisp/filenotify.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/filenotify.el b/lisp/filenotify.el index b3490fd3ebb..e2c0af0d1b7 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -161,7 +161,7 @@ EVENT is the cadr of the event in `file-notify-handle-event' ((eq action 'attrib) 'attribute-changed) ((memq action '(create added)) 'created) ((memq action '(modify modified)) 'changed) - ((memq action '(delete 'delete-self move-self removed)) 'deleted) + ((memq action '(delete delete-self move-self removed)) 'deleted) ;; Make the event pending. ((memq action '(moved-from renamed-from)) (setq file-notify--pending-event @@ -359,9 +359,6 @@ DESCRIPTOR should be an object returned by `file-notify-add-watch'." desc)) (file-notify-error nil)))))) -;; Temporary declarations. -(defalias 'gfile-valid-p 'identity) - (defun file-notify-valid-p (descriptor) "Check a watch specified by its DESCRIPTOR. DESCRIPTOR should be an object returned by `file-notify-add-watch'." |