aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/move.c2
-rw-r--r--src/nvim/window.c2
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;
}