IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1161 from atwupack/vp-7.4.349

Browse Source 
vim-patch:7.4.349
This commit is contained in:
Justin M. Keyes 2014-09-11 16:13:03 -04:00
commit 3254372602
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/screen.c
View File

@ -1356,8 +1356,9 @@ static void win_update(win_T *wp)
(foldmethodIsSyntax(wp)
&& hasAnyFolding(wp)) ||
syntax_check_changed(lnum)))
/* match in fixed position might need redraw */
|| wp->w_match_head != NULL
// match in fixed position might need redraw
// if lines were inserted or deleted
|| (wp->w_match_head != NULL && buf->b_mod_xlines != 0)
))))) {
if (lnum == mod_top)
top_to_mod = FALSE;

2
src/nvim/version.c
View File

@ -246,7 +246,7 @@ static int included_patches[] = {
352,
//351,
//350,
//349,
349,
348,
//347,
346,

6
src/nvim/window.c
View File

@ -5323,12 +5323,13 @@ int match_add(win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos
wp->w_buffer->b_mod_bot = botlnum;
}
} else {
wp->w_buffer->b_mod_set = TRUE;
wp->w_buffer->b_mod_top = toplnum;
wp->w_buffer->b_mod_bot = botlnum;
wp->w_buffer->b_mod_xlines = 0;
}
m->pos.toplnum = toplnum;
m->pos.botlnum = botlnum;
wp->w_buffer->b_mod_set = TRUE;
rtype = VALID;
}
}
@ -5396,10 +5397,11 @@ int match_delete(win_T *wp, int id, int perr)
wp->w_buffer->b_mod_bot = cur->pos.botlnum;
}
} else {
wp->w_buffer->b_mod_set = TRUE;
wp->w_buffer->b_mod_top = cur->pos.toplnum;
wp->w_buffer->b_mod_bot = cur->pos.botlnum;
wp->w_buffer->b_mod_xlines = 0;
}
wp->w_buffer->b_mod_set = TRUE;
rtype = VALID;
}
free(cur);