aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1197: when starting with multiple tabs file messages is confusing

Browse Source 
Problem:    When starting with multiple tabs file messages is confusing.
Solution:   Set 'shortmess' when loading the other tabs. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2019-04-21 15:55:10 +02:00
parent 7bde95a461
commit c75e812623
4 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -2777,6 +2777,7 @@ edit_buffers(
int i;
int advance = TRUE;
win_T *win;
char_u *p_shm_save = NULL;
/*
* Don't execute Win/Buf Enter/Leave autocommands here
@ -2812,6 +2813,17 @@ edit_buffers(
if (curtab->tp_next == NULL) /* just checking */
break;
goto_tabpage(0);
// Temporarily reset 'shm' option to not print fileinfo when
// loading the other buffers. This would overwrite the already
// existing fileinfo for the first tab.
if (i == 1)
{
char buf[100];
p_shm_save = vim_strsave(p_shm);
vim_snprintf(buf, 100, "F%s", p_shm);
set_option_value((char_u *)"shm", 0L, (char_u *)buf, 0);
}
}
else
{
@ -2861,6 +2873,12 @@ edit_buffers(
}
}
if (p_shm_save != NULL)
{
set_option_value((char_u *)"shm", 0L, p_shm_save, 0);
vim_free(p_shm_save);
}
if (parmp->window_layout == WIN_TABS)
goto_tabpage(1);
--autocmd_no_enter;

20
src/testdir/dumps/Test_start_with_tabs.dump Normal file
View File

@ -0,0 +1,20 @@
| +2&#ffffff0|a| | +8#0000001#e0e0e08|b| @1|c| | +1#0000000#ffffff0@64|X+8#0000001#e0e0e08
> +0#0000000#ffffff0@74
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|"+0#0000000&|a|"| |[|N|e|w| |F|i|l|e|]| @42|0|,|0|-|1| @8|A|l@1|

13
src/testdir/test_startup.vim
View File

@ -1,6 +1,7 @@
" Tests for startup.
source shared.vim
source screendump.vim
" Check that loading startup.vim works.
func Test_startup_script()
@ -547,3 +548,15 @@ func Test_issue_3969()
let out = system(GetVimCommand() . ' -es -X -V1 -c "echon ''hello''" -cq')
call assert_equal('hello', out)
endfunc
func Test_start_with_tabs()
if !CanRunVimInTerminal()
return
endif
let buf = RunVimInTerminal('-p a b c', {})
call VerifyScreenDump(buf, 'Test_start_with_tabs', {})
" clean up
call StopVimInTerminal(buf)
endfunc

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1197,
/**/
1196,
/**/