diff options
| author | Michal Nazarewicz <mina86@mina86.com> | 2016-07-27 22:53:57 +0200 |
|---|---|---|
| committer | Michal Nazarewicz <mina86@mina86.com> | 2016-08-02 15:39:10 +0200 |
| commit | da9c55ddbbd08fc07ab36dc8bdc740e352eeab2c (patch) | |
| tree | 597b4d4f7e7a0d784e26b5f114a035b4c068e1f0 /src/regex.h | |
| parent | 04d96eca08ff797c0cd93c33fe8589f4623fc449 (diff) | |
| download | emacs-da9c55ddbbd08fc07ab36dc8bdc740e352eeab2c.tar.gz | |
Get rid of re_set_whitespace_regexp
* src/regex.h (re_set_whitespace_regexp): Delete.
(re_compile_pattern): Add whitespace_regexp argument #ifdef emacs.
* src/regex.c (re_set_whitespace_regexp, whitespace_regexp): Delete.
(regex_compile): Add whitespace_regexp argument #ifdef emacs and wrap
whitespace_regexp-related code in an #ifdef emacs so it’s compiled out
unless building Emacs.
(re_compile_pattern): Pass whitespace_regexp argument to regex_compile
* src/search.c (compile_pattern_1): Don’t use re_set_whitespace_regexp,
pass the regex as argument to re_compile_pattern instead.
Diffstat (limited to 'src/regex.h')
| -rw-r--r-- | src/regex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/regex.h b/src/regex.h index 4497333500a..af9480d583c 100644 --- a/src/regex.h +++ b/src/regex.h @@ -474,6 +474,7 @@ extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax); extern const char *re_compile_pattern (const char *__pattern, size_t __length, #ifdef emacs reg_syntax_t syntax, + const char *whitespace_regexp, #endif struct re_pattern_buffer *__buffer); @@ -627,8 +628,6 @@ extern re_wctype_t re_wctype_parse (const unsigned char **strp, unsigned limit); typedef int re_wchar_t; -extern void re_set_whitespace_regexp (const char *regexp); - #endif /* not WIDE_CHAR_SUPPORT */ #endif /* regex.h */ |