Mercurial > emacs
diff src/search.c @ 90609:bb0e318b7c53
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 447-459)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 141-144)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 03 Oct 2006 05:04:21 +0000 |
parents | b5c13d1564a9 2f768f0aab61 |
children | 8dd8c8286063 |
line wrap: on
line diff
--- a/src/search.c Mon Oct 02 08:05:25 2006 +0000 +++ b/src/search.c Tue Oct 03 05:04:21 2006 +0000 @@ -138,10 +138,11 @@ cp->buf.target_multibyte = multibyte; cp->whitespace_regexp = Vsearch_spaces_regexp; cp->syntax_table = current_buffer->syntax_table; - /* Doing BLOCK_INPUT here has the effect that - the debugger won't run if an error occurs. - Why is BLOCK_INPUT needed here? */ - BLOCK_INPUT; + /* rms: I think BLOCK_INPUT is not needed here any more, + because regex.c defines malloc to call xmalloc. + Using BLOCK_INPUT here means the debugger won't run if an error occurs. + So let's turn it off. */ + /* BLOCK_INPUT; */ old = re_set_syntax (RE_SYNTAX_EMACS | (posix ? 0 : RE_NO_POSIX_BACKTRACKING)); re_set_whitespace_regexp (NILP (Vsearch_spaces_regexp) ? NULL @@ -153,7 +154,7 @@ re_set_whitespace_regexp (NULL); re_set_syntax (old); - UNBLOCK_INPUT; + /* UNBLOCK_INPUT; */ if (val) xsignal1 (Qinvalid_regexp, build_string (val));