Merge branch 'master' into comment-cachecomment-cache

1 files changed, 3 insertions, 6 deletions

diff --git a/src/dired.c b/src/dired.c
index bf10f1710ff..5ea00fb8db4 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -139,7 +139,7 @@ read_dirent (DIR *dir, Lisp_Object dirname)
 #endif
           report_file_error ("Reading directory", dirname);
         }
-      QUIT;
+      maybe_quit ();
     }
 }
 
@@ -248,14 +248,11 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
 
       /* Now that we have unwind_protect in place, we might as well
          allow matching to be interrupted.  */
-      immediate_quit = 1;
-      QUIT;
+      maybe_quit ();
 
       bool wanted = (NILP (match)
                      || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0);
 
-      immediate_quit = 0;
-
       if (wanted)
         {
           if (!NILP (full))
@@ -508,7 +505,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
       ptrdiff_t len = dirent_namelen (dp);
       bool canexclude = 0;
 
-      QUIT;
+      maybe_quit ();
       if (len < SCHARS (encoded_file)
           || (scmp (dp->d_name, SSDATA (encoded_file),
                     SCHARS (encoded_file))