Commit 1fbcc8ad authored by Eli Zaretskii's avatar Eli Zaretskii

Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

parents c1d32a65 1eaf68f3
......@@ -596,7 +596,7 @@ longer than timeout seconds for the events to be delivered."
(should (string-match "another text" (buffer-string)))
;; Stop file notification. Autorevert shall still work via polling.
;; It doesn't work for `w32notify'.
;; It doesn't work for w32notify.
(unless (string-equal (file-notify--test-library) "w32notify")
(file-notify-rm-watch auto-revert-notify-watch-descriptor)
(file-notify--wait-for-events
......@@ -797,7 +797,10 @@ longer than timeout seconds for the events to be delivered."
file-notify--test-tmpfile
'(change) 'file-notify--test-event-handler)))
(unwind-protect
(let ((n 1000)
;; In case of w32notify, the upper limit of events to handle
;; seems to be 260. Reason unknown.
(let ((n (if (string-equal (file-notify--test-library) "w32notify")
250 1000))
source-file-list target-file-list
(default-directory file-notify--test-tmpfile))
(dotimes (i n)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment