diff options
| author | LemonBoy <thatlemon@gmail.com> | 2022-05-09 21:03:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-09 21:03:47 +0100 |
| commit | 57ff52677bf5ba1651281ffe40505df8feba4a36 (patch) | |
| tree | 3c657ec985fabf158175925c607f507221de4ef9 | |
| parent | 6ed545e79735f23ff8e650bc2f0967e5a0baedc9 (diff) | |
patch 8.2.4929: off-by-one error in in statusline itemv8.2.4929
Problem: Off-by-one error in in statusline item.
Solution: Subtrace one less. (closes #10394, closes #5599)
| -rw-r--r-- | src/buffer.c | 3 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_statusline_hl.dump | 6 | ||||
| -rw-r--r-- | src/testdir/test_statusline.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 28 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index 17b1493800..35711f5feb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4446,7 +4446,8 @@ build_stl_str_hl( // correct the start of the items for the truncation for (l = stl_groupitem[groupdepth] + 1; l < curitem; l++) { - stl_items[l].stl_start -= n; + // Minus one for the leading '<' added above. + stl_items[l].stl_start -= n - 1; if (stl_items[l].stl_start < t) stl_items[l].stl_start = t; } diff --git a/src/testdir/dumps/Test_statusline_hl.dump b/src/testdir/dumps/Test_statusline_hl.dump new file mode 100644 index 0000000000..cebece5683 --- /dev/null +++ b/src/testdir/dumps/Test_statusline_hl.dump @@ -0,0 +1,6 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|<+0#ffffff16#e000002|F|G+0#0000e05#ffffff0|H|I| @69 +| +0#0000000&@74 diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim index eaf152593d..7c75f61a87 100644 --- a/src/testdir/test_statusline.vim +++ b/src/testdir/test_statusline.vim @@ -469,7 +469,6 @@ func Test_statusline_removed_group() call writefile(lines, 'XTest_statusline') let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 10, 'cols': 50}) - call TermWait(buf, 50) call VerifyScreenDump(buf, 'Test_statusline_1', {}) " clean up @@ -541,4 +540,22 @@ func Test_statusline_verylong_filename() bwipe! endfunc +func Test_statusline_highlight_truncate() + CheckScreendump + + let lines =<< trim END + set laststatus=2 + hi! link User1 Directory + hi! link User2 ErrorMsg + set statusline=%.5(%1*ABC%2*DEF%1*GHI%) + END + call writefile(lines, 'XTest_statusline') + + let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 6}) + call VerifyScreenDump(buf, 'Test_statusline_hl', {}) + + call StopVimInTerminal(buf) + call delete('XTest_statusline') +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index c069781c34..6fbc3bec02 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4929, +/**/ 4928, /**/ 4927, |