aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1999-01-19 03:24:03 +0000
committerRichard M. Stallman1999-01-19 03:24:03 +0000
commit27c3b45d28c8692a9519da469d0646de6f44c000 (patch)
treecd0bafd8c62657ff1e0bc73f376cd87e5dd01872 /src
parentc8d3ad6afd20aac24c0d0d81b4d9d9359664bbac (diff)
downloademacs-27c3b45d28c8692a9519da469d0646de6f44c000.tar.gz
emacs-27c3b45d28c8692a9519da469d0646de6f44c000.zip
(re_match_2_internal) [WINDOWSNT & emacs]: Insert QUIT at various places.
Diffstat (limited to 'src')
-rw-r--r--src/regex.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/regex.c b/src/regex.c
index 0983c17e795..3f951afe637 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -5007,6 +5007,10 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
5007 on_failure: 5007 on_failure:
5008 DEBUG_PRINT1 ("EXECUTING on_failure_jump"); 5008 DEBUG_PRINT1 ("EXECUTING on_failure_jump");
5009 5009
5010#if defined (WINDOWSNT) && defined (emacs)
5011 QUIT;
5012#endif
5013
5010 EXTRACT_NUMBER_AND_INCR (mcnt, p); 5014 EXTRACT_NUMBER_AND_INCR (mcnt, p);
5011 DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt); 5015 DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt);
5012 5016
@@ -5047,6 +5051,9 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
5047 /* A smart repeat ends with `maybe_pop_jump'. 5051 /* A smart repeat ends with `maybe_pop_jump'.
5048 We change it to either `pop_failure_jump' or `jump'. */ 5052 We change it to either `pop_failure_jump' or `jump'. */
5049 case maybe_pop_jump: 5053 case maybe_pop_jump:
5054#if defined (WINDOWSNT) && defined (emacs)
5055 QUIT;
5056#endif
5050 EXTRACT_NUMBER_AND_INCR (mcnt, p); 5057 EXTRACT_NUMBER_AND_INCR (mcnt, p);
5051 DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt); 5058 DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt);
5052 { 5059 {
@@ -5267,6 +5274,9 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
5267 /* Unconditionally jump (without popping any failure points). */ 5274 /* Unconditionally jump (without popping any failure points). */
5268 case jump: 5275 case jump:
5269 unconditional_jump: 5276 unconditional_jump:
5277#if defined (WINDOWSNT) && defined (emacs)
5278 QUIT;
5279#endif
5270 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ 5280 EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */
5271 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); 5281 DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
5272 p += mcnt; /* Do the jump. */ 5282 p += mcnt; /* Do the jump. */
@@ -5670,6 +5680,9 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
5670 5680
5671 /* We goto here if a matching operation fails. */ 5681 /* We goto here if a matching operation fails. */
5672 fail: 5682 fail:
5683#if defined (WINDOWSNT) && defined (emacs)
5684 QUIT;
5685#endif
5673 if (!FAIL_STACK_EMPTY ()) 5686 if (!FAIL_STACK_EMPTY ())
5674 { /* A restart point is known. Restore to that state. */ 5687 { /* A restart point is known. Restore to that state. */
5675 DEBUG_PRINT1 ("\nFAIL:\n"); 5688 DEBUG_PRINT1 ("\nFAIL:\n");