diff options
author | Noam Postavsky <npostavs@gmail.com> | 2016-10-24 19:54:29 -0400 |
---|---|---|
committer | Noam Postavsky <npostavs@gmail.com> | 2016-10-25 20:15:33 -0400 |
commit | fee4cef7d720e98922858e19b3161358041ec141 (patch) | |
tree | 191cdafd145e0ff5e403b95080f7baaeefbd170c /src/dired.c | |
parent | 4c3f7387df339176a94f49895c92fa6a5f526bae (diff) | |
download | emacs-fee4cef7d720e98922858e19b3161358041ec141.tar.gz emacs-fee4cef7d720e98922858e19b3161358041ec141.tar.bz2 emacs-fee4cef7d720e98922858e19b3161358041ec141.zip |
Revert fixes to allocation of regex matching
The fix was not complete, and completing it was proving too complicated.
- Revert "* src/regex.c (re_search_2): Make new code safe for
-Wjump-misses-init."
This reverts commit c2a17924a57483d14692c8913edbe8ad24b5ffbb.
- Revert "Port to GCC 6.2.1 + --enable-gcc-warnings"
This reverts commit f6134bbda259c115c06d4a9a3ab5c39340a15949.
- Revert "Fix handling of allocation in regex matching"
This reverts commit ad66b3fadb7ae22a4cbb82bb1507c39ceadf3897.
- Revert "Fix handling of buffer relocation in regex.c functions"
This reverts commit ee04aedc723b035eedaf975422d4eb242894121b.
Diffstat (limited to 'src/dired.c')
-rw-r--r-- | src/dired.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dired.c b/src/dired.c index 006f74c834d..dba575ce4c2 100644 --- a/src/dired.c +++ b/src/dired.c @@ -259,11 +259,9 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, QUIT; bool wanted = (NILP (match) - || (re_match_object = name, - re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0)); + || re_search (bufp, SSDATA (name), len, 0, len, 0) >= 0); immediate_quit = 0; - re_match_object = Qnil; /* Stop protecting name from GC. */ if (wanted) { |