mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

Minor fixes for inotify.c and filenotify.el

Browse Source 
* lisp/filenotify.el (file-notify--watch-absolute-filename):
Add docstring.
(file-notify-callback): Simplify.

* src/inotify.c (Finotify_add_watch): Adapt docstring.
This commit is contained in:
Andreas Politz 2017-03-26 11:41:12 +02:00 committed by Michael Albinus
parent 74129db63d
commit 082e2cb3f4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/filenotify.el
View File

@ -52,6 +52,7 @@ could use another implementation.")
callback)
(defun file-notify--watch-absolute-filename (watch)
"Return the absolute filename observed by WATCH."
(if (file-notify--watch-filename watch)
(expand-file-name
(file-notify--watch-filename watch)
@ -204,7 +205,7 @@ EVENT is the cadr of the event in `file-notify-handle-event'
(car file-notify--pending-event)))
;; If the source is handled by another watch, we
;; must fire the rename event there as well.
(when (not (equal desc (caar file-notify--pending-event)))
(unless (equal desc (caar file-notify--pending-event))
(setq pending-event
`((,(caar file-notify--pending-event)
renamed ,file ,file1)
@ -214,9 +215,6 @@ EVENT is the cadr of the event in `file-notify-handle-event'
;; Apply pending callback.
(when pending-event
(setcar
(car pending-event)
(caar pending-event))
(funcall (cadr pending-event) (car pending-event))
(setq pending-event nil))

14
src/inotify.c
View File

@ -382,9 +382,17 @@ If a directory is watched then NAME is the name of file that caused the event.
COOKIE is an object that can be compared using `equal' to identify two matching
renames (moved-from and moved-to).
See inotify(7) and inotify_add_watch(2) for further information. The inotify fd
is managed internally and there is no corresponding inotify_init. Use
`inotify-rm-watch' to remove a watch. */)
See inotify(7) and inotify_add_watch(2) for further information. The
inotify fd is managed internally and there is no corresponding
inotify_init. Use `inotify-rm-watch' to remove a watch.
Also note, that the following inotify bit-masks can not be used, due
to the fact that descriptors are shared across different callers.
IN_EXCL_UNLINK
IN_MASK_ADD
IN_ONESHOT
IN_ONLYDIR */)
(Lisp_Object filename, Lisp_Object aspect, Lisp_Object callback)
{
Lisp_Object encoded_file_name;