Mercurial > vim
changeset 36141:949e1c951582 v9.1.0730
patch 9.1.0730: Crash with cursor-screenline and narrow window
Commit: https://github.com/vim/vim/commit/59149f02692804267e7cc0665d0334f6ff4675be
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sat Sep 14 10:40:29 2024 +0200
patch 9.1.0730: Crash with cursor-screenline and narrow window
Problem: Crash with cursor-screenline and narrow window
(elig0n)
Solution: Don't set right_col when width2 is 0 (zeertzjq).
fixes: #15677
closes: #15678
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 14 Sep 2024 10:45:09 +0200 |
| parents | 1a18508fe595 |
| children | a2988ba313f2 |
| files | src/drawline.c src/testdir/test_cursorline.vim src/version.c |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -62,7 +62,7 @@ margin_columns_win(win_T *wp, int *left_ *left_col = 0; *right_col = width1; - if (wp->w_virtcol >= (colnr_T)width1) + if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0) *right_col = width1 + ((wp->w_virtcol - width1) / width2 + 1) * width2; if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0) *left_col = (wp->w_virtcol - width1) / width2 * width2 + width1;
--- a/src/testdir/test_cursorline.vim +++ b/src/testdir/test_cursorline.vim @@ -309,6 +309,17 @@ func Test_cursorline_screenline_update() call StopVimInTerminal(buf) endfunc +func Test_cursorline_screenline_zero_width() + CheckOption foldcolumn + + set cursorline culopt=screenline winminwidth=1 foldcolumn=1 + " This used to crash Vim + 1vnew | redraw + + bwipe! + set cursorline& culopt& winminwidth& foldcolumn& +endfunc + func Test_cursorline_cursorbind_horizontal_scroll() CheckScreendump