master 309635a 4/4: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 309635af6949ca07da8f6bf8b8e25a1679f7f418
Merge: c0bf73e 8a92030
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    8a92030f6a (origin/emacs-27) Fix hang in autorevert-tests.el
    
    # Conflicts:
    #   test/lisp/autorevert-tests.el
---
 test/lisp/autorevert-tests.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index 45cf635..5f27c2e 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -133,7 +133,9 @@ This expects `auto-revert--messages' to be bound by
                        (format-message
                         "Reverting buffer `%s'\\." (buffer-name buffer))
                        (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.05)
         (sleep-for 0.05)))))