procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify `file-notify--rm-descriptor'

Browse source 
* lisp/filenotify.el (file-notify--rm-descriptor):
Use `file-notify-handle-event'.
This commit is contained in:
Michael Albinus 2021-09-27 20:35:31 +02:00
parent dbe0fc234d
commit 07a276da6f
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/filenotify.el
View file

@ -76,16 +76,17 @@ struct.")
"Remove DESCRIPTOR from `file-notify-descriptors'.
DESCRIPTOR should be an object returned by `file-notify-add-watch'.
If it is registered in `file-notify-descriptors', a `stopped' event is sent."
(when-let* ((watch (gethash descriptor file-notify-descriptors)))
(let ((callback (file-notify--watch-callback watch)))
;; Make sure this is the last time the callback is invoked.
(when-let ((watch (gethash descriptor file-notify-descriptors)))
(unwind-protect
;; Send `stopped' event.
(file-notify-handle-event
(make-file-notify
:-event `(,descriptor stopped
,(file-notify--watch-absolute-filename watch))
:-callback (file-notify--watch-callback watch)))
;; Make sure this is the last time the callback was invoked.
(setf (file-notify--watch-callback watch) nil)
;; Send `stopped' event.
(unwind-protect
(funcall
callback
`(,descriptor stopped ,(file-notify--watch-absolute-filename watch)))
(remhash descriptor file-notify-descriptors)))))
(remhash descriptor file-notify-descriptors))))
(cl-defstruct (file-notify (:type list) :named)
"A file system monitoring event, coming from the backends."