aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonerover <pathfinder1644@yahoo.com>2016-12-16 13:07:10 +0800
committerJames McCoy <jamessan@jamessan.com>2016-12-16 10:07:56 -0500
commitc22a1470265afd57266deb5ade064d8a503c28fb (patch)
treee8394be41a2afdb38a000573f3a871668b41eef3
parentc8c296557b7e7776617737c4080538eafa0d8a81 (diff)
downloadrneovim-c22a1470265afd57266deb5ade064d8a503c28fb.tar.gz
rneovim-c22a1470265afd57266deb5ade064d8a503c28fb.tar.bz2
rneovim-c22a1470265afd57266deb5ade064d8a503c28fb.zip
vim-patch:7.4.2337
Problem: taglist() is still slow. (Luc Hermitte) Solution: Check for CTRL-C less often when finding duplicates. https://github.com/vim/vim/commit/77b642501ac4c84b4e6820d4e5636eb856faaea7
-rw-r--r--src/nvim/tag.c2
-rw-r--r--src/nvim/version.c2
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,