diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-06 07:26:00 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-12-06 07:40:16 +0800 |
| commit | e120a049f0e6594b317819bbc883d9040729bc93 (patch) | |
| tree | 9f4ca78e8f30de4f375fff668e6886c0d0e7e6a5 | |
| parent | 11d2704274ff817678e29f115ba1f074a52e519c (diff) | |
| download | rneovim-e120a049f0e6594b317819bbc883d9040729bc93.tar.gz rneovim-e120a049f0e6594b317819bbc883d9040729bc93.tar.bz2 rneovim-e120a049f0e6594b317819bbc883d9040729bc93.zip | |
fix(float): fix ml_get error with bufpos
| -rw-r--r-- | src/nvim/move.c | 2 | ||||
| -rw-r--r-- | src/nvim/window.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 05795bf858..fecd8130f0 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -933,7 +933,7 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp, bool existing_row = (pos->lnum > 0 && pos->lnum <= wp->w_buffer->b_ml.ml_line_count); - if ((local && existing_row) || visible_row) { + if ((local || visible_row) && existing_row) { colnr_T off; colnr_T col; int width; diff --git a/src/nvim/window.c b/src/nvim/window.c index 1f80f14f26..86c936c734 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -849,7 +849,7 @@ void win_config_float(win_T *wp, FloatConfig fconfig) pos_T pos = { wp->w_float_config.bufpos.lnum + 1, wp->w_float_config.bufpos.col, 0 }; int trow, tcol, tcolc, tcole; - textpos2screenpos(wp, &pos, &trow, &tcol, &tcolc, &tcole, true); + textpos2screenpos(parent, &pos, &trow, &tcol, &tcolc, &tcole, true); row += trow - 1; col += tcol - 1; } |