To: vim_dev@googlegroups.com Subject: Patch 8.2.1072 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1072 Problem: Missing libvterm test. Solution: Sync with libvterm revision 768. Files: src/libvterm/src/state.c, src/libvterm/t/63screen_resize.test *** ../vim-8.2.1071/src/libvterm/src/state.c 2020-06-21 17:57:28.017960419 +0200 --- src/libvterm/src/state.c 2020-06-27 18:09:00.275892535 +0200 *************** *** 1844,1857 **** 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.col < 0) state->pos.col = 0; updatecursor(state, &oldpos, 1); --- 1844,1857 ---- state->pos.col++; } 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; updatecursor(state, &oldpos, 1); *** ../vim-8.2.1071/src/libvterm/t/63screen_resize.test 2020-05-18 21:50:32.932742338 +0200 --- src/libvterm/t/63screen_resize.test 2020-06-27 18:10:29.791437826 +0200 *************** *** 69,74 **** --- 69,90 ---- ?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 *** ../vim-8.2.1071/src/version.c 2020-06-27 18:06:42.152575113 +0200 --- src/version.c 2020-06-27 18:10:06.987554419 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1072, /**/ -- ARTHUR: If you do not open these doors, we will take this castle by force ... [A bucket of slops land on ARTHUR. He tries to retain his dignity.] "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///