diff options
author | Glenn Morris <rgm@gnu.org> | 2021-10-16 09:18:37 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2021-10-16 09:18:37 -0700 |
commit | 536968304bd2ab70819b2920fc015e4bf9330636 (patch) | |
tree | 9a3936312a2e00c0b15888a59a4273425dc2ba18 /test/lisp/filenotify-tests.el | |
parent | ffff168d5fb14fbfa74f7c04fab0235a14bb7e64 (diff) | |
parent | e8488808dfe1460ce07042a1a523097ab90cf079 (diff) | |
download | emacs-536968304bd2ab70819b2920fc015e4bf9330636.tar.gz |
Merge from origin/emacs-28
e8488808df Avoid aborts when a thread is signaled while "waiting for ...
21397cce51 Improve documentation string for 'compilation-error-regexp...
2971a6890f * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix t...
e842d7f29a Fix removal of fringe indication of bookmarks
b5a0eda978 Prefer "graphical displays" to "X terminals" in documentation
4ad0fc0dd0 Precise documentation of file-notify-add-watch
f5b8df14c6 Fixes to account for windows' tab lines
ced72b6e4c * Fix `native-compile-target-directory' effectiveness on t...
502788bc3d Add missing single quotes in the Emacs manual
1af45ad04e ; * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix...
12654b7423 * lisp/menu-bar.el (yank-menu-length): Fix docstring (bug#...
# Conflicts:
# lisp/gnus/gnus-undo.el
# lisp/menu-bar.el
Diffstat (limited to 'test/lisp/filenotify-tests.el')
-rw-r--r-- | test/lisp/filenotify-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index e8a647df909..0fe72f278dc 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -766,7 +766,7 @@ delivered." ;; the directory. Except for ;; GFam{File,Directory}Monitor, GPollFileMonitor and ;; kqueue. And GFam{File,Directory}Monitor and - ;; GPollFileMonitordo not raise a `changed' event. + ;; GPollFileMonitor do not raise a `changed' event. ((memq (file-notify--test-monitor) '(GFamFileMonitor GFamDirectoryMonitor GPollFileMonitor)) '(created deleted stopped)) |