|
 |
1fa1ff |
To: vim_dev@googlegroups.com
|
|
|
1fa1ff |
Subject: Patch 7.4.003
|
|
|
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.003
|
|
|
1fa1ff |
Problem: Memory access error in Ruby syntax highlighting. (Christopher Chow)
|
|
|
1fa1ff |
Solution: Refresh stale pointer. (James McCoy)
|
|
|
1fa1ff |
Files: src/regexp_nfa.c
|
|
|
1fa1ff |
|
|
|
1fa1ff |
|
|
|
1fa1ff |
*** ../vim-7.4.002/src/regexp_nfa.c 2013-08-14 13:31:03.000000000 +0200
|
|
|
1fa1ff |
--- src/regexp_nfa.c 2013-08-14 14:02:06.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 4120,4126 ****
|
|
|
1fa1ff |
sub = &subs->norm;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#ifdef FEAT_SYN_HL
|
|
|
1fa1ff |
! else if (state->c >= NFA_ZOPEN)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
subidx = state->c - NFA_ZOPEN;
|
|
|
1fa1ff |
sub = &subs->synt;
|
|
|
1fa1ff |
--- 4120,4126 ----
|
|
|
1fa1ff |
sub = &subs->norm;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#ifdef FEAT_SYN_HL
|
|
|
1fa1ff |
! else if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
subidx = state->c - NFA_ZOPEN;
|
|
|
1fa1ff |
sub = &subs->synt;
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 4189,4194 ****
|
|
|
1fa1ff |
--- 4189,4201 ----
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
|
|
|
1fa1ff |
subs = addstate(l, state->out, subs, pim, off);
|
|
|
1fa1ff |
+ /* "subs" may have changed, need to set "sub" again */
|
|
|
1fa1ff |
+ #ifdef FEAT_SYN_HL
|
|
|
1fa1ff |
+ if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9)
|
|
|
1fa1ff |
+ sub = &subs->synt;
|
|
|
1fa1ff |
+ else
|
|
|
1fa1ff |
+ #endif
|
|
|
1fa1ff |
+ sub = &subs->norm;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
if (save_in_use == -1)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 4237,4243 ****
|
|
|
1fa1ff |
sub = &subs->norm;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#ifdef FEAT_SYN_HL
|
|
|
1fa1ff |
! else if (state->c >= NFA_ZCLOSE)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
subidx = state->c - NFA_ZCLOSE;
|
|
|
1fa1ff |
sub = &subs->synt;
|
|
|
1fa1ff |
--- 4244,4250 ----
|
|
|
1fa1ff |
sub = &subs->norm;
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#ifdef FEAT_SYN_HL
|
|
|
1fa1ff |
! else if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
subidx = state->c - NFA_ZCLOSE;
|
|
|
1fa1ff |
sub = &subs->synt;
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 4281,4286 ****
|
|
|
1fa1ff |
--- 4288,4300 ----
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
|
|
|
1fa1ff |
subs = addstate(l, state->out, subs, pim, off);
|
|
|
1fa1ff |
+ /* "subs" may have changed, need to set "sub" again */
|
|
|
1fa1ff |
+ #ifdef FEAT_SYN_HL
|
|
|
1fa1ff |
+ if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9)
|
|
|
1fa1ff |
+ sub = &subs->synt;
|
|
|
1fa1ff |
+ else
|
|
|
1fa1ff |
+ #endif
|
|
|
1fa1ff |
+ sub = &subs->norm;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
if (REG_MULTI)
|
|
|
1fa1ff |
sub->list.multi[subidx].end = save_lpos;
|
|
|
1fa1ff |
*** ../vim-7.4.002/src/version.c 2013-08-14 13:31:03.000000000 +0200
|
|
|
1fa1ff |
--- src/version.c 2013-08-14 14:03:51.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 729,730 ****
|
|
|
1fa1ff |
--- 729,732 ----
|
|
|
1fa1ff |
{ /* Add new patch number below this line */
|
|
|
1fa1ff |
+ /**/
|
|
|
1fa1ff |
+ 3,
|
|
|
1fa1ff |
/**/
|
|
|
1fa1ff |
|
|
|
1fa1ff |
--
|
|
|
1fa1ff |
Where do you want to crash today?
|
|
|
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 ///
|