patch 9.1.0416: some screen dump tests can be improved
Commit:
https://github.com/vim/vim/commit/2e642734f4be506483315b8881748a7ef45854f4
Author: Luuk van Baal <[email protected]>
Date: Fri May 17 18:25:13 2024 +0200
patch 9.1.0416: some screen dump tests can be improved
Problem: some screen dump tests can be improved (after 9.1.0414)
Solution: Make sure screen state changes properly and is captured in the
screen dumps (Luuk van Baal)
closes: #14788
Signed-off-by: Luuk van Baal <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/dumps/Test_smooth_long_scrolloff_2.dump
b/src/testdir/dumps/Test_smooth_long_scrolloff_2.dump
index 5b9e20d8d..9162df0c2 100644
--- a/src/testdir/dumps/Test_smooth_long_scrolloff_2.dump
+++ b/src/testdir/dumps/Test_smooth_long_scrolloff_2.dump
@@ -1,8 +1,8 @@
-|<+0#4040ff13#ffffff0@2| +0#0000000&|l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
->t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
+|<+0#4040ff13#ffffff0@2|t+0#0000000&|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g| |t|w|o| |l|o|n|g| |t
+|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l
+|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g|
+|t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o|
+>l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g
+| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o
+| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n
| @39
diff --git a/src/testdir/dumps/Test_smooth_long_scrolloff_3.dump
b/src/testdir/dumps/Test_smooth_long_scrolloff_3.dump
index 5b9e20d8d..1a1fcaeae 100644
--- a/src/testdir/dumps/Test_smooth_long_scrolloff_3.dump
+++ b/src/testdir/dumps/Test_smooth_long_scrolloff_3.dump
@@ -1,8 +1,8 @@
-|<+0#4040ff13#ffffff0@2| +0#0000000&|l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
->t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-| @39
+|<+0#4040ff13#ffffff0@2|l+0#0000000&|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l
+|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g|
+|t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o|
+|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g
+> |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o
+| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n
+|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| @20
+@40
diff --git a/src/testdir/dumps/Test_smooth_long_scrolloff_4.dump
b/src/testdir/dumps/Test_smooth_long_scrolloff_4.dump
index 6ecdf5b31..4ed62b65b 100644
--- a/src/testdir/dumps/Test_smooth_long_scrolloff_4.dump
+++ b/src/testdir/dumps/Test_smooth_long_scrolloff_4.dump
@@ -1,8 +1,8 @@
-|<+0#4040ff13#ffffff0@2| +0#0000000&|l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
->t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-| @39
+|<+0#4040ff13#ffffff0@2|l+0#0000000&|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l
+|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g|
+|t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o|
+|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g
+| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o
+> |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n
+|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| @20
+@40
diff --git a/src/testdir/dumps/Test_smooth_long_scrolloff_5.dump
b/src/testdir/dumps/Test_smooth_long_scrolloff_5.dump
index 5ff26d279..6d7e1578d 100644
--- a/src/testdir/dumps/Test_smooth_long_scrolloff_5.dump
+++ b/src/testdir/dumps/Test_smooth_long_scrolloff_5.dump
@@ -1,8 +1,8 @@
-|<+0#4040ff13#ffffff0@2| +0#0000000&|l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
->t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-| @39
+|<+0#4040ff13#ffffff0@2|l+0#0000000&|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l
+|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g|
+|t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o|
+|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g
+| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o
+| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n
+>g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| @20
+@40
diff --git a/src/testdir/dumps/Test_smooth_long_scrolloff_6.dump
b/src/testdir/dumps/Test_smooth_long_scrolloff_6.dump
index 2ef87da37..4f5dcea8b 100644
--- a/src/testdir/dumps/Test_smooth_long_scrolloff_6.dump
+++ b/src/testdir/dumps/Test_smooth_long_scrolloff_6.dump
@@ -1,8 +1,8 @@
-|<+0#4040ff13#ffffff0@2| +0#0000000&|l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
-|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o| |l|o|n|g|t|w|o|
|l|o|n|g
+|<+0#4040ff13#ffffff0@2| +0#0000000&|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
+|l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n|g
+| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g|
|t|w|o
+| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| |t|w|o|
|l|o|n
+|g| |t|w|o| |l|o|n|g| |t|w|o| |l|o|n|g| @20
>t|h|r|e@1| @34
|f|o|u|r| @35
@40
diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim
index fa1d032c2..1b60019c3 100644
--- a/src/testdir/test_scroll_opt.vim
+++ b/src/testdir/test_scroll_opt.vim
@@ -1158,12 +1158,12 @@ func Test_smooth_long_scrolloff()
let lines =<< trim END
set smoothscroll scrolloff=3
- call setline(1, ['one', 'two long'->repeat(100), 'three', 'four', 'five',
'six'])
+ call setline(1, ['one', 'two long '->repeat(100), 'three', 'four', 'five',
'six'])
END
call writefile(lines, 'XSmoothLongScrolloff', 'D')
let buf = RunVimInTerminal('-u NONE -S XSmoothLongScrolloff', #{rows: 8,
cols: 40})
"FIXME: empty screen due to reset_skipcol()/curs_columns() shenanigans
- call term_sendkeys(buf, ":norm j601|\<CR>")
+ call term_sendkeys(buf, ":norm j721|\<CR>")
call VerifyScreenDump(buf, 'Test_smooth_long_scrolloff_1', {})
call term_sendkeys(buf, "gj")
diff --git a/src/version.c b/src/version.c
index cfaac746c..cd4c1af65 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 416,
/**/
415,
/**/
--
--
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 on the web visit
https://groups.google.com/d/msgid/vim_dev/E1s80TA-007ktN-4o%40256bit.org.
