# HG changeset patch # User Bram Moolenaar # Date 1593274504 -7200 # Node ID f5206c7044036d60860d0e0df96dde06a9aa56de # Parent 57c5030aa95c9b9d47d9ae7ce5109178a7d01701 patch 8.2.1072: missing libvterm test Commit: https://github.com/vim/vim/commit/a0a0c4147fd966e0cd923a2bbfb84b14b15a297e Author: Bram Moolenaar Date: Sat Jun 27 18:13:10 2020 +0200 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 --- a/src/libvterm/src/state.c +++ b/src/libvterm/src/state.c @@ -1844,14 +1844,14 @@ static int on_resize(int rows, int cols, 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.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; - if(state->pos.col < 0) - state->pos.col = 0; updatecursor(state, &oldpos, 1); diff --git a/src/libvterm/t/63screen_resize.test b/src/libvterm/t/63screen_resize.test --- 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 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1072, +/**/ 1071, /**/ 1070,