|
 |
134223f |
To: vim_dev@googlegroups.com
|
|
|
134223f |
Subject: Patch 7.4.029
|
|
|
134223f |
Fcc: outbox
|
|
|
134223f |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
134223f |
Mime-Version: 1.0
|
|
|
134223f |
Content-Type: text/plain; charset=UTF-8
|
|
|
134223f |
Content-Transfer-Encoding: 8bit
|
|
|
134223f |
------------
|
|
|
134223f |
|
|
|
134223f |
Patch 7.4.029
|
|
|
134223f |
Problem: An error in a pattern is reported twice.
|
|
|
134223f |
Solution: Remove the retry with the backtracking engine, it won't work.
|
|
|
134223f |
Files: src/regexp.c
|
|
|
134223f |
|
|
|
134223f |
|
|
|
134223f |
*** ../vim-7.4.028/src/regexp.c 2013-08-25 17:01:36.000000000 +0200
|
|
|
134223f |
--- src/regexp.c 2013-09-19 17:03:31.000000000 +0200
|
|
|
134223f |
***************
|
|
|
134223f |
*** 8016,8027 ****
|
|
|
134223f |
}
|
|
|
134223f |
#endif
|
|
|
134223f |
/*
|
|
|
134223f |
! * If NFA engine failed, then revert to the backtracking engine.
|
|
|
134223f |
! * Except when there was a syntax error, which was properly handled by
|
|
|
134223f |
! * NFA engine.
|
|
|
134223f |
! */
|
|
|
134223f |
if (regexp_engine == AUTOMATIC_ENGINE)
|
|
|
134223f |
prog = bt_regengine.regcomp(expr, re_flags);
|
|
|
134223f |
}
|
|
|
134223f |
|
|
|
134223f |
return prog;
|
|
|
134223f |
--- 8016,8026 ----
|
|
|
134223f |
}
|
|
|
134223f |
#endif
|
|
|
134223f |
/*
|
|
|
134223f |
! * If the NFA engine failed, the backtracking engine won't work either.
|
|
|
134223f |
! *
|
|
|
134223f |
if (regexp_engine == AUTOMATIC_ENGINE)
|
|
|
134223f |
prog = bt_regengine.regcomp(expr, re_flags);
|
|
|
134223f |
+ */
|
|
|
134223f |
}
|
|
|
134223f |
|
|
|
134223f |
return prog;
|
|
|
134223f |
*** ../vim-7.4.028/src/version.c 2013-09-19 17:00:14.000000000 +0200
|
|
|
134223f |
--- src/version.c 2013-09-19 17:01:13.000000000 +0200
|
|
|
134223f |
***************
|
|
|
134223f |
*** 740,741 ****
|
|
|
134223f |
--- 740,743 ----
|
|
|
134223f |
{ /* Add new patch number below this line */
|
|
|
134223f |
+ /**/
|
|
|
134223f |
+ 29,
|
|
|
134223f |
/**/
|
|
|
134223f |
|
|
|
134223f |
--
|
|
|
134223f |
The term "free software" is defined by Richard M. Stallman as
|
|
|
134223f |
being software that isn't necessarily for free. Confusing?
|
|
|
134223f |
Let's call it "Stallman software" then!
|
|
|
134223f |
-- Bram Moolenaar
|
|
|
134223f |
|
|
|
134223f |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
134223f |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
134223f |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
134223f |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|