Merge #11737 from janlazo/vim-8.1.2421

vim-patch:8.1.{2031,2421}

scripts/vim-patch.sh

@@ -560,6 +560,7 @@ list_missing_previous_vimpatches_for_patch() {
     printf 'NOTE: "%s" is not a Vim tag - listing all oldest missing patches\n' "${for_vim_patch}" >&2
   fi
   for fname in "${fnames[@]}"; do
+    i=$(( i+1 ))
     printf '[%.*d/%d] %s: ' "${#n}" "$i" "$n" "$fname"
 
     local -a missing_vim_patches=()
@@ -572,6 +573,7 @@ list_missing_previous_vimpatches_for_patch() {
     else
       local missing_vim_commit="${missing_vim_commit_info%%:*}"
       if [[ -z "${vim_tag}" ]] || [[ "${missing_vim_commit}" < "${vim_tag}" ]]; then
+        printf -- "%s\n" "$missing_vim_commit_info"
         missing_list+=("$missing_vim_commit_info")
       else
         printf -- "-\n"

src/nvim/screen.c

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

src/nvim/testdir/test_python2.vim

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

src/nvim/testdir/test_python3.vim

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