diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-16 10:08:26 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-16 10:08:26 -0500 |
| commit | aa4ef8966c12a6bd51d31ce32618e9844053aa04 (patch) | |
| tree | 871ded79a6eaef704b48d9510cef8a7b3a14eda0 | |
| parent | a26188b58d1d69725d2c804bd098b11a3b1162a0 (diff) | |
| parent | c22a1470265afd57266deb5ade064d8a503c28fb (diff) | |
| download | rneovim-aa4ef8966c12a6bd51d31ce32618e9844053aa04.tar.gz rneovim-aa4ef8966c12a6bd51d31ce32618e9844053aa04.tar.bz2 rneovim-aa4ef8966c12a6bd51d31ce32618e9844053aa04.zip | |
Merge pull request #5779 from lonerover/vim-7.4.2337
vim-patch:7.4.2337
| -rw-r--r-- | src/nvim/tag.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 597f737410..f83154afbf 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -1862,7 +1862,7 @@ parse_line: && memcmp(mfp2->match, mfp->match, (size_t)mfp->len) == 0) break; - line_breakcheck(); + fast_breakcheck(); } if (i < 0) { ((struct match_found **)(ga_match[mtt].ga_data)) diff --git a/src/nvim/version.c b/src/nvim/version.c index 7de0b508a3..8e7ad2199f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -103,7 +103,7 @@ static int included_patches[] = { // 2340 NA // 2339, // 2338 NA - // 2337, + 2337, // 2336, // 2335, // 2334, |