diff options
| author | Richard M. Stallman | 2006-09-24 20:28:49 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-09-24 20:28:49 +0000 |
| commit | e7b2dd2e38ca595ea09f2bff8c0d8fc45e88cd4e (patch) | |
| tree | fec561a55dd1e81a4ca256058268791d75c48b24 /src | |
| parent | 3f56acf9678eb1f928d491a2333ba9ae35b5c5df (diff) | |
| download | emacs-e7b2dd2e38ca595ea09f2bff8c0d8fc45e88cd4e.tar.gz emacs-e7b2dd2e38ca595ea09f2bff8c0d8fc45e88cd4e.zip | |
(compile_pattern_1): Don't BLOCK_INPUT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/search.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/search.c b/src/search.c index a74a320c356..e26b8f883e1 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -171,10 +171,11 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte) | |||
| 171 | cp->buf.multibyte = multibyte; | 171 | cp->buf.multibyte = multibyte; |
| 172 | cp->whitespace_regexp = Vsearch_spaces_regexp; | 172 | cp->whitespace_regexp = Vsearch_spaces_regexp; |
| 173 | cp->syntax_table = current_buffer->syntax_table; | 173 | cp->syntax_table = current_buffer->syntax_table; |
| 174 | /* Doing BLOCK_INPUT here has the effect that | 174 | /* rms: I think BLOCK_INPUT is not needed here any more, |
| 175 | the debugger won't run if an error occurs. | 175 | because regex.c defines malloc to call xmalloc. |
| 176 | Why is BLOCK_INPUT needed here? */ | 176 | Using BLOCK_INPUT here means the debugger won't run if an error occurs. |
| 177 | BLOCK_INPUT; | 177 | So let's turn it off. */ |
| 178 | /* BLOCK_INPUT; */ | ||
| 178 | old = re_set_syntax (RE_SYNTAX_EMACS | 179 | old = re_set_syntax (RE_SYNTAX_EMACS |
| 179 | | (posix ? 0 : RE_NO_POSIX_BACKTRACKING)); | 180 | | (posix ? 0 : RE_NO_POSIX_BACKTRACKING)); |
| 180 | 181 | ||
| @@ -187,7 +188,7 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte) | |||
| 187 | re_set_whitespace_regexp (NULL); | 188 | re_set_whitespace_regexp (NULL); |
| 188 | 189 | ||
| 189 | re_set_syntax (old); | 190 | re_set_syntax (old); |
| 190 | UNBLOCK_INPUT; | 191 | /* UNBLOCK_INPUT; */ |
| 191 | if (val) | 192 | if (val) |
| 192 | xsignal1 (Qinvalid_regexp, build_string (val)); | 193 | xsignal1 (Qinvalid_regexp, build_string (val)); |
| 193 | 194 | ||