diff options
| author | David Bürgin <676c7473@gmail.com> | 2015-04-26 11:41:51 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-27 01:41:42 -0400 |
| commit | d9a51ca8119ba05056d593b8ca5b7161d12fc1c1 (patch) | |
| tree | 147d5e2dec0c82477647dc499b164b38e43a5ada /src | |
| parent | b3519ca73b37879f1b43230d0e1903fdc5c64547 (diff) | |
| download | rneovim-d9a51ca8119ba05056d593b8ca5b7161d12fc1c1.tar.gz rneovim-d9a51ca8119ba05056d593b8ca5b7161d12fc1c1.tar.bz2 rneovim-d9a51ca8119ba05056d593b8ca5b7161d12fc1c1.zip | |
vim-patch:7.4.554
Problem: Missing part of patch 7.4.519.
Solution: Copy back regprog after calling vim_regexec.
https://github.com/vim/vim/tree/v7-4-554
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/quickfix.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 5cf2f4d5a7..a37a41caeb 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -561,7 +561,9 @@ restofline: tail = NULL; regmatch.regprog = fmt_ptr->prog; - if (vim_regexec(®match, IObuff, (colnr_T)0)) { + int r = vim_regexec(®match, IObuff, (colnr_T)0); + fmt_ptr->prog = regmatch.regprog; + if (r) { if ((idx == 'C' || idx == 'Z') && !multiline) continue; if (vim_strchr((char_u *)"EWI", idx) != NULL) diff --git a/src/nvim/version.c b/src/nvim/version.c index b80f91e294..d4c2a42250 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -215,7 +215,7 @@ static int included_patches[] = { //557 NA //556 NA //555 NA - //554, + 554, 553, 552, 551, |