IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #11737 from janlazo/vim-8.1.2421

Browse Source 
vim-patch:8.1.{2031,2421}
This commit is contained in:
Justin M. Keyes 2020-01-19 13:28:50 -08:00 committed by GitHub
commit 198d94da0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vim-patch.sh
View File

@ -560,6 +560,7 @@ list_missing_previous_vimpatches_for_patch() {
local -a missing_vim_patches=() local -a missing_vim_patches=()
_set_missing_vimpatches 1 -- "${fname}" _set_missing_vimpatches 1 -- "${fname}"
set +u # Avoid "unbound variable" with bash < 4.4 below.
local missing_vim_commit_info="${missing_vim_patches[0]}" local missing_vim_commit_info="${missing_vim_patches[0]}"
if [[ -z "${missing_vim_commit_info}" ]]; then if [[ -z "${missing_vim_commit_info}" ]]; then
printf -- "-\n" printf -- "-\n"
@ -572,6 +573,7 @@ list_missing_previous_vimpatches_for_patch() {
printf -- "-\n" printf -- "-\n"
fi fi
fi fi
set -u
done done
set +u # Avoid "unbound variable" with bash < 4.4 below. set +u # Avoid "unbound variable" with bash < 4.4 below.

1
src/nvim/screen.c
View File

@ -3868,6 +3868,7 @@ win_line (
} }
wp->w_wrow = row; wp->w_wrow = row;
did_wcol = true; did_wcol = true;
curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
} }
// Don't override visual selection highlighting. // Don't override visual selection highlighting.

2
src/nvim/testdir/test_python2.vim
View File

@ -1,5 +1,5 @@
" Test for python 2 commands. " Test for python 2 commands.
" TODO: move tests from test87.in here. " TODO: move tests from test86.in here.
if !has('python') if !has('python')
finish finish

2
src/nvim/testdir/test_python3.vim
View File

@ -1,5 +1,5 @@
" Test for python 3 commands. " Test for python 3 commands.
" TODO: move tests from test88.in here. " TODO: move tests from test87.in here.
if !has('python3') if !has('python3')
finish finish