aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlonerover <pathfinder1644@yahoo.com>2016-12-19 12:15:25 +0800
committerlonerover <pathfinder1644@yahoo.com>2016-12-19 12:38:12 +0800
commit3e7f78b6cff7db8f100f2ceedf04ec70f8a9e073 (patch)
tree37aadae342a340f4fb665a024e64f9ce8d8c2b77 /src
parent33319b1bf012652cd04e47bf9d5ac216408703e2 (diff)
downloadrneovim-3e7f78b6cff7db8f100f2ceedf04ec70f8a9e073.tar.gz
rneovim-3e7f78b6cff7db8f100f2ceedf04ec70f8a9e073.tar.bz2
rneovim-3e7f78b6cff7db8f100f2ceedf04ec70f8a9e073.zip
vim-patch:7.4.2335
Problem: taglist() is slow. (Luc Hermitte) Solution: Check for CTRL-C less often when doing a linear search. (closes vim/vim#1044) https://github.com/vim/vim/commit/72b4b870fcc445c14faf282e0595b5f9406b101d
Diffstat (limited to 'src')
-rw-r--r--src/nvim/tag.c7
-rw-r--r--src/nvim/version.c2
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