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

Minor fixes in filenotify.el

Browse source 
* lisp/filenotify.el (top): Require 'cl-lib.
(file-notify--rm-descriptor)
(file-notify--event-watched-file): Use cl-caadr.
(file-notify-callback): Handle also `ignore' events from inotify.
This commit is contained in:
Michael Albinus 2016-02-22 22:05:00 +01:00
parent a9c48d5c9e
commit 1bc0e0a5b7
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

@ -27,8 +27,7 @@
;;; Code: ;;; Code:
(eval-when-compile (require 'cl-lib)
(require 'cl))
(defconst file-notify--library (defconst file-notify--library
(cond (cond
@ -58,7 +57,7 @@ DESCRIPTOR should be an object returned by `file-notify-add-watch'.
If it is registered in `file-notify-descriptors', a stopped event is sent." If it is registered in `file-notify-descriptors', a stopped event is sent."
(let* ((desc (if (consp descriptor) (car descriptor) descriptor)) (let* ((desc (if (consp descriptor) (car descriptor) descriptor))
(registered (gethash desc file-notify-descriptors)) (registered (gethash desc file-notify-descriptors))
(file (if (consp descriptor) (cdr descriptor) (caadr registered))) (file (if (consp descriptor) (cdr descriptor) (cl-caadr registered)))
(dir (car registered))) (dir (car registered)))
(when (consp registered) (when (consp registered)
@ -104,7 +103,7 @@ It is a form ((DESCRIPTOR ACTION FILE [FILE1-OR-COOKIE]) CALLBACK).")
Could be different from the directory watched by the backend library." Could be different from the directory watched by the backend library."
(let* ((desc (if (consp (car event)) (caar event) (car event))) (let* ((desc (if (consp (car event)) (caar event) (car event)))
(registered (gethash desc file-notify-descriptors)) (registered (gethash desc file-notify-descriptors))
(file (if (consp (car event)) (cdar event) (caadr registered))) (file (if (consp (car event)) (cdar event) (cl-caadr registered)))
(dir (car registered))) (dir (car registered)))
(if file (expand-file-name file dir) dir))) (if file (expand-file-name file dir) dir)))
@ -274,11 +273,13 @@ EVENT is the cadr of the event in `file-notify-handle-event'
`(,(file-notify--descriptor desc (car entry)) ,action ,file)))) `(,(file-notify--descriptor desc (car entry)) ,action ,file))))
;; Send `stopped' event. ;; Send `stopped' event.
(when (and (memq action '(deleted renamed)) (when (or stopped
;; Not, when a file is backed up. (and (memq action '(deleted renamed))
(not (and (stringp file1) (backup-file-name-p file1))) ;; Not, when a file is backed up.
;; Watched file or directory is concerned. (not (and (stringp file1) (backup-file-name-p file1)))
(string-equal file (file-notify--event-watched-file event))) ;; Watched file or directory is concerned.
(string-equal
file (file-notify--event-watched-file event))))
(file-notify-rm-watch (file-notify--descriptor desc (car entry)))))))) (file-notify-rm-watch (file-notify--descriptor desc (car entry))))))))
;; `kqueue', `gfilenotify' and `w32notify' return a unique descriptor ;; `kqueue', `gfilenotify' and `w32notify' return a unique descriptor