diff options
| -rwxr-xr-x | scripts/vim-patch.sh | 10 | ||||
| -rw-r--r-- | src/nvim/tag.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index b5d795424b..88fb3cae04 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -61,10 +61,10 @@ clean_files() { read -p "Delete these files (Y/n)? " -n 1 -r reply echo - if [[ "${reply}" =~ ^[Yy]$ ]]; then - rm -- "${CREATED_FILES[@]}" - else + if [[ "${reply}" == n ]]; then echo "You can use 'git clean' to remove these files when you're done." + else + rm -- "${CREATED_FILES[@]}" fi } @@ -370,7 +370,7 @@ review_commit() { printf -- "$(head -n 4 <<< "${nvim_patch}")\n\n" local reply read -p "Continue reviewing (y/N)? " -n 1 -r reply - if [[ ! "${reply}" =~ ^[Nn]$ ]]; then + if [[ "${reply}" == y ]]; then echo return fi @@ -436,7 +436,7 @@ review_pr() { if [[ "${pr_commit_url}" != "${pr_commit_urls[-1]}" ]]; then read -p "Continue with next commit (Y/n)? " -n 1 -r reply echo - if [[ ! "${reply}" =~ ^[Yy]$ ]]; then + if [[ "${reply}" == n ]]; then break fi fi 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 d5947932de..ce103ec7dd 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 |