diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-04-22 13:31:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 13:31:41 +0200 |
| commit | f2db5521eb545e451f261470c6bfc31dfac11887 (patch) | |
| tree | 517117509ac6111e2cae27355d0b1aa207f2e47e /src | |
| parent | fb5e2db4c72251ac8f59a7b80fc6d6b40dbec1d8 (diff) | |
| parent | 5f18dd30137565da782c155b52b530c172b3b29d (diff) | |
| download | rneovim-f2db5521eb545e451f261470c6bfc31dfac11887.tar.gz rneovim-f2db5521eb545e451f261470c6bfc31dfac11887.tar.bz2 rneovim-f2db5521eb545e451f261470c6bfc31dfac11887.zip | |
Merge pull request #28434 from glepnir/23120
fix(float): wrong position when bufpos is out of range
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/window.c | 3 | ||||
| -rw-r--r-- | src/nvim/winfloat.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 07e769b7ac..4c3fb5770c 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -827,7 +827,8 @@ void ui_ext_win_position(win_T *wp, bool validate) row += row_off; col += col_off; if (c.bufpos.lnum >= 0) { - pos_T pos = { c.bufpos.lnum + 1, c.bufpos.col, 0 }; + int lnum = MIN(c.bufpos.lnum + 1, win->w_buffer->b_ml.ml_line_count); + pos_T pos = { lnum, c.bufpos.col, 0 }; int trow, tcol, tcolc, tcole; textpos2screenpos(win, &pos, &trow, &tcol, &tcolc, &tcole, true); row += trow - 1; diff --git a/src/nvim/winfloat.c b/src/nvim/winfloat.c index 65d2c1306b..f271f7d055 100644 --- a/src/nvim/winfloat.c +++ b/src/nvim/winfloat.c @@ -221,7 +221,7 @@ void win_config_float(win_T *wp, WinConfig fconfig) row += row_off; col += col_off; if (wp->w_config.bufpos.lnum >= 0) { - pos_T pos = { wp->w_config.bufpos.lnum + 1, + pos_T pos = { MIN(wp->w_config.bufpos.lnum + 1, parent->w_buffer->b_ml.ml_line_count), wp->w_config.bufpos.col, 0 }; int trow, tcol, tcolc, tcole; textpos2screenpos(parent, &pos, &trow, &tcol, &tcolc, &tcole, true); |