diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-15 04:17:25 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-15 04:17:25 -0500 |
| commit | 7609a96a35224be3d7f3ba77691f9115e0281b4e (patch) | |
| tree | 24e2a3a9bb6bd21ca2a59bb4c1b6bb565d357603 /src | |
| parent | baee9fe286fdcb9b04914feb8ab875c6143c2883 (diff) | |
| parent | ec6fcf3b1ccd788c065a49dfa5e78b01409aceb8 (diff) | |
| download | rneovim-7609a96a35224be3d7f3ba77691f9115e0281b4e.tar.gz rneovim-7609a96a35224be3d7f3ba77691f9115e0281b4e.tar.bz2 rneovim-7609a96a35224be3d7f3ba77691f9115e0281b4e.zip | |
Merge pull request #4260 from watiko/vim-7.4.887
vim-patch:7.4.887
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/regexp_nfa.c | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 4020fa6e28..dd41535110 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -4048,6 +4048,7 @@ skip_add: sub->list.multi[subidx].start_col = (colnr_T)(reginput - regline + off); } + sub->list.multi[subidx].end_lnum = -1; } else { if (subidx < sub->in_use) { save_ptr = sub->list.line[subidx].start; diff --git a/src/nvim/version.c b/src/nvim/version.c index caffda7302..4de63ebb10 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -401,7 +401,7 @@ static int included_patches[] = { // 890 NA // 889, // 888, - // 887, + 887, // 886 NA // 885, // 884 NA |