diff options
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) | |||
| 139 | #endif | 139 | #endif |
| 140 | report_file_error ("Reading directory", dirname); | 140 | report_file_error ("Reading directory", dirname); |
| 141 | } | 141 | } |
| 142 | QUIT; | 142 | maybe_quit (); |
| 143 | } | 143 | } |
| 144 | } | 144 | } |
| 145 | 145 | ||
| @@ -248,14 +248,11 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, | |||
| 248 | 248 | ||
| 249 | /* Now that we have unwind_protect in place, we might as well | 249 | /* Now that we have unwind_protect in place, we might as well |
| 250 | allow matching to be interrupted. */ | 250 | allow matching to be interrupted. */ |
| 251 | immediate_quit = 1; | 251 | maybe_quit (); |
| 252 | QUIT; | ||
| 253 | 252 | ||
| 254 | bool wanted = (NILP (match) | 253 | bool wanted = (NILP (match) |
| 255 | || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0); | 254 | || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0); |
| 256 | 255 | ||
| 257 | immediate_quit = 0; | ||
| 258 | |||
| 259 | if (wanted) | 256 | if (wanted) |
| 260 | { | 257 | { |
| 261 | if (!NILP (full)) | 258 | if (!NILP (full)) |
| @@ -508,7 +505,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag, | |||
| 508 | ptrdiff_t len = dirent_namelen (dp); | 505 | ptrdiff_t len = dirent_namelen (dp); |
| 509 | bool canexclude = 0; | 506 | bool canexclude = 0; |
| 510 | 507 | ||
| 511 | QUIT; | 508 | maybe_quit (); |
| 512 | if (len < SCHARS (encoded_file) | 509 | if (len < SCHARS (encoded_file) |
| 513 | || (scmp (dp->d_name, SSDATA (encoded_file), | 510 | || (scmp (dp->d_name, SSDATA (encoded_file), |
| 514 | SCHARS (encoded_file)) | 511 | SCHARS (encoded_file)) |