mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix Bug#21669

Browse source 
* lisp/filenotify.el (file-notify-rm-watch): Improve check for
calling low-level functions.

* test/automated/file-notify-tests.el (file-notify--test-timeout):
Decrase to 6 seconds for remote directories.
(file-notify-test02-events): Expect different number of
`attribute-changed' events for the local and remote cases.  Apply
short delays between the operations, in order to receive all
events in the remote case.  Combine `attribute-change' tests.
(Bug#21669)
This commit is contained in:
Michael Albinus 2015-10-23 13:14:09 +02:00
parent 0f7334147d
commit 71d6acff1c
2 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/filenotify.el
View file

@ -333,7 +333,9 @@ DESCRIPTOR should be an object returned by `file-notify-add-watch'."
(when (stringp dir)
;; Call low-level function.
(when (null (cdr registered))
(when (or (not file)
(and (= (length (cdr registered)) 1)
(assoc file (cdr registered))))
(condition-case nil
(if handler
;; A file name handler could exist even if there is no local