diff options
| author | Nickolas Lloyd | 2017-02-01 22:31:55 -0500 |
|---|---|---|
| committer | Nickolas Lloyd | 2017-02-01 22:31:55 -0500 |
| commit | 9a15b5509abb49a11c97c1101ad216f4ef258368 (patch) | |
| tree | 7311337d92833cb8f233eaa696a967a15a306a80 /src/dired.c | |
| parent | 5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa (diff) | |
| parent | 70d36dda26465b43c1a63e8e13153e070af86456 (diff) | |
| download | emacs-nick.lloyd-bytecode-jit.tar.gz emacs-nick.lloyd-bytecode-jit.zip | |
Merge branch 'master' into nick.lloyd-bytecode-jitnick.lloyd-bytecode-jit
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/dired.c b/src/dired.c index 52e81fb380b..5ea00fb8db4 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -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 = true; | ||
| 252 | maybe_quit (); | 251 | maybe_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 = false; | ||
| 258 | |||
| 259 | if (wanted) | 256 | if (wanted) |
| 260 | { | 257 | { |
| 261 | if (!NILP (full)) | 258 | if (!NILP (full)) |