|
 |
1fa1ff |
To: vim_dev@googlegroups.com
|
|
|
1fa1ff |
Subject: Patch 7.4.008
|
|
|
1fa1ff |
Fcc: outbox
|
|
|
1fa1ff |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1fa1ff |
Mime-Version: 1.0
|
|
|
1fa1ff |
Content-Type: text/plain; charset=UTF-8
|
|
|
1fa1ff |
Content-Transfer-Encoding: 8bit
|
|
|
1fa1ff |
------------
|
|
|
1fa1ff |
|
|
|
1fa1ff |
Patch 7.4.008
|
|
|
1fa1ff |
Problem: New regexp engine can't be interrupted.
|
|
|
1fa1ff |
Solution: Check for CTRL-C pressed. (Yasuhiro Matsumoto)
|
|
|
1fa1ff |
Files: src/regexp_nfa.c, src/regexp.c
|
|
|
1fa1ff |
|
|
|
1fa1ff |
|
|
|
1fa1ff |
*** ../vim-7.4.007/src/regexp_nfa.c 2013-08-14 14:18:37.000000000 +0200
|
|
|
1fa1ff |
--- src/regexp_nfa.c 2013-08-25 16:55:56.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 5089,5094 ****
|
|
|
1fa1ff |
--- 5089,5100 ----
|
|
|
1fa1ff |
return FALSE;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#endif
|
|
|
1fa1ff |
+ /* Some patterns may take a long time to match, especially when using
|
|
|
1fa1ff |
+ * recursive_regmatch(). Allow interrupting them with CTRL-C. */
|
|
|
1fa1ff |
+ fast_breakcheck();
|
|
|
1fa1ff |
+ if (got_int)
|
|
|
1fa1ff |
+ return FALSE;
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
nfa_match = FALSE;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/* Allocate memory for the lists of nodes. */
|
|
|
1fa1ff |
*** ../vim-7.4.007/src/regexp.c 2013-08-01 18:31:30.000000000 +0200
|
|
|
1fa1ff |
--- src/regexp.c 2013-08-25 16:57:35.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 4311,4318 ****
|
|
|
1fa1ff |
*/
|
|
|
1fa1ff |
for (;;)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! /* Some patterns may cause a long time to match, even though they are not
|
|
|
1fa1ff |
! * illegal. E.g., "\([a-z]\+\)\+Q". Allow breaking them with CTRL-C. */
|
|
|
1fa1ff |
fast_breakcheck();
|
|
|
1fa1ff |
|
|
|
1fa1ff |
#ifdef DEBUG
|
|
|
1fa1ff |
--- 4311,4318 ----
|
|
|
1fa1ff |
*/
|
|
|
1fa1ff |
for (;;)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! /* Some patterns may take a long time to match, e.g., "\([a-z]\+\)\+Q".
|
|
|
1fa1ff |
! * Allow interrupting them with CTRL-C. */
|
|
|
1fa1ff |
fast_breakcheck();
|
|
|
1fa1ff |
|
|
|
1fa1ff |
#ifdef DEBUG
|
|
|
1fa1ff |
*** ../vim-7.4.007/src/version.c 2013-08-22 14:14:23.000000000 +0200
|
|
|
1fa1ff |
--- src/version.c 2013-08-25 16:57:51.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 729,730 ****
|
|
|
1fa1ff |
--- 729,732 ----
|
|
|
1fa1ff |
{ /* Add new patch number below this line */
|
|
|
1fa1ff |
+ /**/
|
|
|
1fa1ff |
+ 8,
|
|
|
1fa1ff |
/**/
|
|
|
1fa1ff |
|
|
|
1fa1ff |
--
|
|
|
1fa1ff |
hundred-and-one symptoms of being an internet addict:
|
|
|
1fa1ff |
124. You begin conversations with, "Who is your internet service provider?"
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1fa1ff |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1fa1ff |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
1fa1ff |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|