diff options
| author | Alan Mackenzie <acm@muc.de> | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /src/dired.c | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-comment-cache.tar.gz | |
Merge branch 'master' into comment-cachecomment-cache
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 9 |
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)) |