procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* search.c (Flooking_at, Fstring_match, fast_string_match,

Browse source 
search_buffer): Don't block input while calling searching and
	matching functions.  These functions may not call malloc under
	Emacs anyway, and we need to be able to check for C-g.
This commit is contained in:
Jim Blandy 1993-06-10 12:52:31 +00:00
parent 85be31013c
commit 2d52e48f10
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/search.c
View file

@ -172,11 +172,9 @@ data if you want to preserve them.")
s2 = 0;
}
BLOCK_INPUT;
i = re_match_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
point - BEGV, &search_regs,
ZV - BEGV);
UNBLOCK_INPUT;
if (i == -2)
matcher_overflow ();
@ -224,11 +222,9 @@ matched by parenthesis constructs in the pattern.")
compile_pattern (regexp, &searchbuf, &search_regs,
!NILP (current_buffer->case_fold_search) ? DOWNCASE_TABLE : 0);
immediate_quit = 1;
BLOCK_INPUT;
val = re_search (&searchbuf, (char *) XSTRING (string)->data,
XSTRING (string)->size, s, XSTRING (string)->size - s,
&search_regs);
UNBLOCK_INPUT;
immediate_quit = 0;
last_thing_searched = Qt;
if (val == -2)
@ -249,11 +245,9 @@ fast_string_match (regexp, string)
compile_pattern (regexp, &searchbuf, 0, 0);
immediate_quit = 1;
BLOCK_INPUT;
val = re_search (&searchbuf, (char *) XSTRING (string)->data,
XSTRING (string)->size, 0, XSTRING (string)->size,
0);
UNBLOCK_INPUT;
immediate_quit = 0;
return val;
}
@ -671,12 +665,10 @@ search_buffer (string, pos, lim, n, RE, trt, inverse_trt)
while (n < 0)
{
int val;
BLOCK_INPUT;
val = re_search_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
pos - BEGV, lim - pos, &search_regs,
/* Don't allow match past current point */
pos - BEGV);
UNBLOCK_INPUT;
if (val == -2)
matcher_overflow ();
if (val >= 0)
@ -702,11 +694,9 @@ search_buffer (string, pos, lim, n, RE, trt, inverse_trt)
while (n > 0)
{
int val;
BLOCK_INPUT;
val = re_search_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
pos - BEGV, lim - pos, &search_regs,
lim - BEGV);
UNBLOCK_INPUT;
if (val == -2)
matcher_overflow ();
if (val >= 0)