kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1736 from fwalch/vim-7.4.528

Browse Source 
vim-patch:7.4.528
This commit is contained in:
Justin M. Keyes 2014-12-27 08:27:43 -05:00
commit 4cd0d702e5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/screen.c
View File

@ -5738,7 +5738,18 @@ next_search_hl (
shl->lnum = lnum; shl->lnum = lnum;
if (shl->rm.regprog != NULL) { if (shl->rm.regprog != NULL) {
/* Remember whether shl->rm is using a copy of the regprog in
* cur->match. */
bool regprog_is_copy = (shl != &search_hl
&& cur != NULL
&& shl == &cur->hl
&& cur->match.regprog == cur->hl.rm.regprog);
nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, matchcol, &(shl->tm)); nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, matchcol, &(shl->tm));
/* Copy the regprog, in case it got freed and recompiled. */
if (regprog_is_copy) {
cur->match.regprog = cur->hl.rm.regprog;
}
if (called_emsg || got_int) { if (called_emsg || got_int) {
// Error while handling regexp: stop using this regexp. // Error while handling regexp: stop using this regexp.
if (shl == &search_hl) { if (shl == &search_hl) {

2
src/nvim/version.c
View File

@ -210,7 +210,7 @@ static int included_patches[] = {
//531, //531,
//530, //530,
//529, //529,
//528, 528,
527, 527,
//526, //526,
//525, //525,