mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.1362: last entry of ":set term=xxx" overwritten by error message
Problem: Last entry of ":set term=xxx" overwritten by error message when 'cmdheight' is two or more. (Tony Mechelynck) Solution: Output extra line breaks.
This commit is contained in:
parent
6a25026262
commit
ecd34bf55d
@ -1763,6 +1763,7 @@ get_term_entries(int *height, int *width)
|
|||||||
report_term_error(char *error_msg, char_u *term)
|
report_term_error(char *error_msg, char_u *term)
|
||||||
{
|
{
|
||||||
struct builtin_term *termp;
|
struct builtin_term *termp;
|
||||||
|
int i;
|
||||||
|
|
||||||
mch_errmsg("\r\n");
|
mch_errmsg("\r\n");
|
||||||
if (error_msg != NULL)
|
if (error_msg != NULL)
|
||||||
@ -1787,6 +1788,10 @@ report_term_error(char *error_msg, char_u *term)
|
|||||||
mch_errmsg("\r\n");
|
mch_errmsg("\r\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Output extra 'cmdheight' line breaks to avoid that the following error
|
||||||
|
// message overwrites the last terminal name.
|
||||||
|
for (i = 1; i < p_ch; ++i)
|
||||||
|
mch_errmsg("\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -7,6 +7,7 @@ CheckUnix
|
|||||||
|
|
||||||
source shared.vim
|
source shared.vim
|
||||||
source mouse.vim
|
source mouse.vim
|
||||||
|
source view_util.vim
|
||||||
|
|
||||||
func Test_term_mouse_left_click()
|
func Test_term_mouse_left_click()
|
||||||
new
|
new
|
||||||
@ -1893,6 +1894,17 @@ func Test_get_termcode()
|
|||||||
set ttybuiltin
|
set ttybuiltin
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_list_builtin_terminals()
|
||||||
|
let buf = RunVimInTerminal('', #{rows: 14})
|
||||||
|
call term_sendkeys(buf, ":set cmdheight=3\<CR>")
|
||||||
|
call term_wait(buf, 100)
|
||||||
|
call term_sendkeys(buf, ":set term=xxx\<CR>")
|
||||||
|
call term_wait(buf, 100)
|
||||||
|
call assert_match('builtin_dumb', term_getline(buf, 11))
|
||||||
|
call assert_match('Not found in termcap', term_getline(buf, 12))
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
endfunc
|
||||||
|
|
||||||
func GetEscCodeCSI27(key, modifier)
|
func GetEscCodeCSI27(key, modifier)
|
||||||
let key = printf("%d", char2nr(a:key))
|
let key = printf("%d", char2nr(a:key))
|
||||||
let mod = printf("%d", a:modifier)
|
let mod = printf("%d", a:modifier)
|
||||||
|
@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1362,
|
||||||
/**/
|
/**/
|
||||||
1361,
|
1361,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user