From: Glenn Morris <rgm@gnu.org>
Date: Mon, 29 Mar 2021 15:31:15 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3096
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=309635af6949ca07da8f6bf8b8e25a1679f7f418;p=emacs.git

Merge from origin/emacs-27

8a92030f6a (origin/emacs-27) Fix hang in autorevert-tests.el

# Conflicts:
#	test/lisp/autorevert-tests.el
---

309635af6949ca07da8f6bf8b8e25a1679f7f418
diff --cc test/lisp/autorevert-tests.el
index 45cf6353960,8b8313df015..5f27c2e38a6
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@@ -132,10 -130,12 +132,12 @@@ This expects `auto-revert--messages' t
                  (null (string-match
                         (format-message
                          "Reverting buffer `%s'\\." (buffer-name buffer))
 -                       auto-revert--messages)))
 +                       (or auto-revert--messages ""))))
-       (if (with-current-buffer buffer auto-revert-use-notify)
+       (if (and (or file-notify--library
+                    (file-remote-p temporary-file-directory))
+                (with-current-buffer buffer auto-revert-use-notify))
 -          (read-event nil nil 0.1)
 -        (sleep-for 0.1)))))
 +          (read-event nil nil 0.05)
 +        (sleep-for 0.05)))))
  
  (defmacro auto-revert--deftest-remote (test docstring)
    "Define ert `TEST-remote' for remote files."