mirror of
https://github.com/vim/vim.git
synced 2026-05-28 00:21:37 +02:00
patch 9.2.0238: showmode message may not be displayed
Problem: showmode message may not be displayed (Yee Cheng Chin)
Solution: Don't call char_avail() in skip_showmode(), but check
for anything in the stuff and typeahead buffer
(Hirohito Higashi).
Fix "-- VISUAL --" not shown when terminal responses are pending
When starting Vim with a script that enters Visual mode (e.g.
"vim -S script.vim"), the "-- VISUAL --" mode message sometimes
doesn't appear. This happens because skip_showmode() calls
char_avail(), which reads raw terminal input and picks up terminal
response escape sequences (e.g. t_RV response). Combined with
!KeyTyped (which is TRUE after script execution), this causes
skip_showmode() to return TRUE, preventing the mode from being
displayed.
Fix this by checking only the stuff buffer and typeahead buffer for
pending characters, instead of char_avail() which also reads raw
terminal input. This way, terminal response sequences no longer
interfere with mode display.
fixes: #16620
closes: #19801
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Christian Brabandt <cb@256bit.org>
Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
25f6539645
commit
9a2260d6cf
+7
-4
@@ -4417,17 +4417,20 @@ screen_del_lines(
|
||||
|
||||
/*
|
||||
* Return TRUE when postponing displaying the mode message: when not redrawing
|
||||
* or inside a mapping.
|
||||
* or inside a mapping or a script.
|
||||
*/
|
||||
int
|
||||
skip_showmode(void)
|
||||
{
|
||||
// Call char_avail() only when we are going to show something, because it
|
||||
// takes a bit of time. redrawing() may also call char_avail().
|
||||
// Check the stuff buffer, typeahead buffer and script input for pending
|
||||
// characters, instead of char_avail() which also reads raw terminal input
|
||||
// and may pick up terminal response sequences (e.g. t_RV response),
|
||||
// falsely preventing the mode from being shown.
|
||||
if (global_busy
|
||||
|| msg_silent != 0
|
||||
|| !redrawing()
|
||||
|| (char_avail() && !KeyTyped))
|
||||
|| ((!stuff_empty() || typebuf.tb_len > 0 || using_script())
|
||||
&& !KeyTyped))
|
||||
{
|
||||
redraw_mode = TRUE; // show mode later
|
||||
return TRUE;
|
||||
|
||||
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
238,
|
||||
/**/
|
||||
237,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user