patch 9.1.1448: tabpanel is not displayed correctly when msg_scrolled
Commit:
https://github.com/vim/vim/commit/3ca6776a577fd0a324ee435c9234e202301acaab
Author: Hirohito Higashi <[email protected]>
Date: Tue Jun 10 20:19:04 2025 +0200
patch 9.1.1448: tabpanel is not displayed correctly when msg_scrolled
Problem: tabpanel is not displayed correctly when msg_scrolled
Solution: remove the msg_scrolled condition (Hirohito Higashi)
fixes: #17502
closes: #17510
Signed-off-by: Hirohito Higashi <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/tabpanel.c b/src/tabpanel.c
index 3845faa8f..260768a3d 100644
--- a/src/tabpanel.c
+++ b/src/tabpanel.c
@@ -120,9 +120,6 @@ tabpanelopt_changed(void)
int
tabpanel_width(void)
{
- if (msg_scrolled != 0)
- return 0;
-
switch (p_stpl)
{
case 0:
diff --git a/src/testdir/dumps/Test_tabpanel_with_msg_scrolled_0.dump
b/src/testdir/dumps/Test_tabpanel_with_msg_scrolled_0.dump
new file mode 100644
index 000000000..cd65a0a26
--- /dev/null
+++ b/src/testdir/dumps/Test_tabpanel_with_msg_scrolled_0.dump
@@ -0,0 +1,10 @@
+|[+2&#ffffff0|N|o| |N|a|m|e|]| @11|[|N|o| |N|a|m|e|]| | +8#0000001#e0e0e08|+|
|N|o| |N|a|m|e|]| | +1#0000000#ffffff0|X+8#0000001#e0e0e08
+|+| |[|N|o| |N|a|m|e|]| @8> +0#0000000#ffffff0@24
+| +1&&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +0#0000000&@44
diff --git a/src/testdir/dumps/Test_tabpanel_with_msg_scrolled_1.dump
b/src/testdir/dumps/Test_tabpanel_with_msg_scrolled_1.dump
new file mode 100644
index 000000000..d1da8d23e
--- /dev/null
+++ b/src/testdir/dumps/Test_tabpanel_with_msg_scrolled_1.dump
@@ -0,0 +1,10 @@
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| @11|[|N|o| |N|a|m|e|]| |
+2#0000000#ffffff0|+| |N|o| |N|a|m|e|]| | +1&&|X+8#0000001#e0e0e08
+|++2#0000000#ffffff0| |[|N|o| |N|a|m|e|]| @8> +0&&@24
+| +1&&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +0#0000000&@44
diff --git a/src/testdir/test_tabpanel.vim b/src/testdir/test_tabpanel.vim
index 0d729a82e..959734fca 100644
--- a/src/testdir/test_tabpanel.vim
+++ b/src/testdir/test_tabpanel.vim
@@ -653,4 +653,25 @@ function Test_tabpanel_error()
set tabpanel&vim
set showtabpanel&vim
endfunc
+
+function Test_tabpanel_with_msg_scrolled()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set noruler
+ tabnew
+ set modified
+ tabfirst
+ END
+ call writefile(lines, 'XTest_tabpanel_with_msg_scrolled', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_with_msg_scrolled', {'rows':
10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_with_msg_scrolled_0', {})
+ call term_sendkeys(buf, ":qa\<CR>")
+ call term_sendkeys(buf, "\<CR>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_with_msg_scrolled_1', {})
+
+ call StopVimInTerminal(buf)
+endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 05be1d862..44ec23153 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1448,
/**/
1447,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uP3jX-00BoM9-Ne%40256bit.org.
