From 58033e15d536a03f47de1e547ef0780dd05cd887 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sun, 19 Jan 2020 09:44:43 -0500
Subject: [PATCH 1/3] vim-patch:8.1.2031: cursor position wrong when resizing
 and using conceal

Problem:    Cursor position wrong when resizing and using conceal.
Solution:   Set the flags that the cursor position is valid when setting the
            row and column during redrawing. (closes vim/vim#4931)
https://github.com/vim/vim/commit/5babc6e858afbfa54aa0e203a64b9c70175487b7
---
 src/nvim/screen.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 24ad012201..047af8db75 100644
--- a/src/nvim/screen.c
+++ b/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.

From 4c152be72665808a45f1e957e3fde53eaf9bdc25 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sun, 19 Jan 2020 10:05:23 -0500
Subject: [PATCH 2/3] fixup! fixup! vim-patch.sh: list related missing Vim
 patches [ci skip] #11514

---
 scripts/vim-patch.sh | 2 ++
 1 file changed, 2 insertions(+)

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

From f5cc5153c6a73af50b034676e116b667892ababe Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sun, 19 Jan 2020 09:14:06 -0500
Subject: [PATCH 3/3] vim-patch:8.1.2421: test88 is old style

Problem:    Test88 is old style.
Solution:   Turn into a new style test. (Yegappan Lakshmanan, closes vim/vim#5347)
https://github.com/vim/vim/commit/213ed008bbcd9fe0d3329b17f5f4af0169e448ff

'test_conceal.vim' requires +conceal and +terminal so it is N/A.
---
 src/nvim/testdir/test_python2.vim | 2 +-
 src/nvim/testdir/test_python3.vim | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/testdir/test_python2.vim b/src/nvim/testdir/test_python2.vim
index 9628a298b9..5895ac85a8 100644
--- a/src/nvim/testdir/test_python2.vim
+++ b/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
diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim
index 108f78f976..436d74b85d 100644
--- a/src/nvim/testdir/test_python3.vim
+++ b/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