diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index a09689d65b9..d5ccb7d1e0e 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -323,11 +323,11 @@ The document was typeset with ")) "A list specifying text to insert by default into a new file. Elements look like (CONDITION . ACTION) or ((CONDITION . DESCRIPTION) . ACTION). -CONDITION may be a regexp that must match the new file's name, or it may be -a symbol that must match the major mode for this element to apply. -CONDITION can also be a custom predicate of no arguments declared with -'(predicate FUNCTION)'. Emacs will insert the text if the predicate -function returns non-nil. +CONDITION may be a regexp that must match the new file's name, or it +may be a symbol that must match the major mode for this element to apply. +CONDITION can also be a custom predicate of no arguments declared +with (predicate FUNCTION). Emacs will insert the text if the +predicate function returns non-nil. Only the first matching element is effective. Optional DESCRIPTION is a string for filling `auto-insert-prompt'. ACTION may be a skeleton to insert (see `skeleton-insert'), an absolute diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el index 20b67628223..ca38084b2b5 100644 --- a/test/lisp/autorevert-tests.el +++ b/test/lisp/autorevert-tests.el @@ -219,7 +219,8 @@ It is checked for buffer-local `auto-revert-notify-watch-descriptor'." ,@body) (customize-set-variable 'auto-revert-interval auto-revert-interval-orig) (setq auto-revert--lockout-interval auto-revert--lockout-interval-orig) - (file-notify-rm-all-watches)))) + (ignore-errors (file-notify-rm-all-watches)) + (sleep-for 1)))) (defun auto-revert-test--write-region (string file &optional append) "Write STRING to FILE."