patch 9.2.0256: visual selection size not shown in showcmd during test

Problem:  The visual selection size is not displayed in the showcmd area
          when entering visual mode from a script or mapping, because
          char_avail() incorrectly reports input as pending. This causes
          test failure on CI with the ASAN CI runner.
Solution: Replace char_avail() with explicit checks for an empty stuff
          buffer, empty typeahead buffer, and not running a script
          (zeertzjq).

related: #19801
closes:  #19824

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/normal.c b/src/normal.c
index a9b01821d47db0b5cee97f715935c970c3585a55..01ea4c0915a2314427b9194e7712afa6f5410650 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -1616,7 +1616,8 @@ clear_showcmd(void)
     if (!p_sc)
        return;
 
-    if (VIsual_active && !char_avail())
+    if (VIsual_active
+       && stuff_empty() && typebuf.tb_len == 0 && !using_script())
     {
        int             cursor_bot = LT_POS(VIsual, curwin->w_cursor);
        long            lines;

diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index 1ba407f05138fd60790391704000cd233695ccb6..ac27354d489f3a220d891d9721fee910fe2f3b0f 100644 (file)
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -1634,7 +1634,6 @@ func Test_visual_block_hl_with_autoselect()
   call writefile(lines, 'XTest_visual_block_autoselect', 'D')
 
   let buf = RunVimInTerminal('-S XTest_visual_block_autoselect', {'rows': 10})
-  call TermWait(buf)
   call VerifyScreenDump(buf, 'Test_visual_block_hl_with_autoselect_1', {})
   call term_sendkeys(buf, 'l')
   call VerifyScreenDump(buf, 'Test_visual_block_hl_with_autoselect_2', {})

diff --git a/src/version.c b/src/version.c
index a1e911946f73533d676247d1102522e4a4bbe7ee..5dbd0f40178b0cba46f733cdd9bee7fe2cae7065 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    256,
 /**/
     255,
 /**/