diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-22 10:38:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 10:38:58 -0500 |
| commit | 98a9bedb62d000e8f801e045a53c64ed829d7223 (patch) | |
| tree | e945b6018a9e460b0bb68fc50876249b55bc4411 | |
| parent | 81fcba90a7be7ab77d871c0527579d43fb186edc (diff) | |
| parent | 3e7f78b6cff7db8f100f2ceedf04ec70f8a9e073 (diff) | |
| download | rneovim-98a9bedb62d000e8f801e045a53c64ed829d7223.tar.gz rneovim-98a9bedb62d000e8f801e045a53c64ed829d7223.tar.bz2 rneovim-98a9bedb62d000e8f801e045a53c64ed829d7223.zip | |
Merge pull request #5809 from lonerover/vim-7.4.2335
vim-patch:7.4.2335
| -rw-r--r-- | src/nvim/tag.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c index f83154afbf..0b76e36a6b 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -1297,7 +1297,12 @@ find_tags ( * Read and parse the lines in the file one by one */ 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(); + } if ((flags & TAG_INS_COMP)) /* Double brackets for gcc */ ins_compl_check_keys(30, false); if (got_int || compl_interrupted) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 8e7ad2199f..cd7b70b027 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -105,7 +105,7 @@ static int included_patches[] = { // 2338 NA 2337, // 2336, - // 2335, + 2335, // 2334, // 2333, // 2332 NA |