summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-09-06 20:24:50 +0200
committerBram Moolenaar <Bram@vim.org>2016-09-06 20:24:50 +0200
commit72b4b870fcc445c14faf282e0595b5f9406b101d (patch)
treea1578b3d40655f3e0bfc63b1b416a2b2d0b20086
parent1b0c2fcf6e85c9b85c24757ba970061e1f3e4e80 (diff)
downloadvim-git-72b4b870fcc445c14faf282e0595b5f9406b101d.tar.gz
patch 7.4.2335v7.4.2335
Problem: taglist() is slow. (Luc Hermitte) Solution: Check for CTRL-C less often when doing a linear search. (closes #1044)
-rw-r--r--src/tag.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/tag.c b/src/tag.c
index 2920482b3..b2d1f151a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1578,7 +1578,11 @@ find_tags(
*/
for (;;)
{
- line_breakcheck(); /* check for CTRL-C typed */
+ /* check for CTRL-C typed, more often when jumping around */
+ if (state == TS_BINARY || state == TS_SKIP_BACK)
+ line_breakcheck();
+ else
+ fast_breakcheck();
#ifdef FEAT_INS_EXPAND
if ((flags & TAG_INS_COMP)) /* Double brackets for gcc */
ins_compl_check_keys(30);
diff --git a/src/version.c b/src/version.c
index 4e76bc7b3..63ee91918 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2335,
+/**/
2334,
/**/
2333,