aboutsummaryrefslogtreecommitdiffstats
path: root/src/dired.c
diff options
context:
space:
mode:
authorPaul Eggert2016-11-04 15:01:17 -0700
committerPaul Eggert2016-11-04 15:01:17 -0700
commit6a20bd3579ef87103d5ea37e6b8193dc6385e547 (patch)
treee11a49c3cbb7e72ccfb6689fbad81bcccfd12665 /src/dired.c
parent29559361f56c9398dcb69db7396dcfc0887843a2 (diff)
parentdbb341022870ecad4c9177485a6770a355633cc0 (diff)
downloademacs-6a20bd3579ef87103d5ea37e6b8193dc6385e547.tar.gz
emacs-6a20bd3579ef87103d5ea37e6b8193dc6385e547.zip
Merge from origin/emacs-25
dbb3410 python.el: Fix detection of native completion in Python 3 (bu... 91c97b6 * Makefile.in (install-arch-indep): Skip etc/refcards/emacsve... 9c1cb8d * lisp/subr.el (set-transient-map): Exit for unbound events (... 9c247d2 Update category-table for Chinese characters 43986d1 Inhibit buffer relocation during regex searches fee4cef Revert fixes to allocation of regex matching
Diffstat (limited to 'src/dired.c')
-rw-r--r--src/dired.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dired.c b/src/dired.c
index c69164b2a1f..e468147e8b2 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -253,11 +253,9 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
253 QUIT; 253 QUIT;
254 254
255 bool wanted = (NILP (match) 255 bool wanted = (NILP (match)
256 || (re_match_object = name, 256 || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0);
257 re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0));
258 257
259 immediate_quit = 0; 258 immediate_quit = 0;
260 re_match_object = Qnil; /* Stop protecting name from GC. */
261 259
262 if (wanted) 260 if (wanted)
263 { 261 {