patch 8.2.1072: missing libvterm test

Problem:    Missing libvterm test.
Solution:   Sync with libvterm revision 768.

diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c
index 30438efe820f1dc5d1a9eabd897e70ec7439e556..4fe3d7d20b6fde7d95c4e3b65d91471fb51c41b3 100644 (file)
--- a/src/libvterm/src/state.c
+++ b/src/libvterm/src/state.c
@@ -1844,14 +1844,14 @@ static int on_resize(int rows, int cols, void *user)
     state->pos.col++;
   }
 
-  if(state->pos.row >= rows)
-    state->pos.row = rows - 1;
   if(state->pos.row < 0)
     state->pos.row = 0;
-  if(state->pos.col >= cols)
-    state->pos.col = cols - 1;
+  if(state->pos.row >= rows)
+    state->pos.row = rows - 1;
   if(state->pos.col < 0)
     state->pos.col = 0;
+  if(state->pos.col >= cols)
+    state->pos.col = cols - 1;
 
   updatecursor(state, &oldpos, 1);
 

diff --git a/src/libvterm/t/63screen_resize.test b/src/libvterm/t/63screen_resize.test
index 87932f66d4c855b734513e8a336104ab770e32b2..87b88d64e06318298a0643ee152f80232c529299 100644 (file)
--- a/src/libvterm/t/63screen_resize.test
+++ b/src/libvterm/t/63screen_resize.test
@@ -69,6 +69,22 @@ RESIZE 24,80
   ?screen_chars 22,0,23,10 = "Line 25"
   ?cursor = 23,0
 
+!Resize shorter does not send the cursor to a negative row
+# See also https://github.com/vim/vim/pull/6141
+RESET
+WANTSCREEN -b
+RESIZE 25,80
+WANTSCREEN b
+PUSH "\e[24HLine 24\r\nLine 25\e[H"
+  ?cursor = 0,0
+RESIZE 20,80
+  sb_pushline 80 =
+  sb_pushline 80 =
+  sb_pushline 80 =
+  sb_pushline 80 =
+  sb_pushline 80 =
+  ?cursor = 0,0
+
 !Resize taller attempts to pop scrollback
 RESET
 WANTSCREEN -b

diff --git a/src/version.c b/src/version.c
index 6c8e5e0418669b5abf483b2ef44fc86608aaa3c8..51a93365f14805756a8a08f70e5af5b38296c52d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1072,
 /**/
     1071,
 /**/