aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-10-02 03:43:39 +0200
committerGitHub <noreply@github.com>2019-10-02 03:43:39 +0200
commite63fdf63ba057877573dbb3171a8c7ae698cf1bc (patch)
tree28baa93d934b2574883e0640e3ebce6394039e0f /src/nvim/screen.c
parent60b56ed458c6b35d5045959192b49da5a0ea84f3 (diff)
parenteef3809067ae0f613e30b711ef720415c7016381 (diff)
downloadrneovim-e63fdf63ba057877573dbb3171a8c7ae698cf1bc.tar.gz
rneovim-e63fdf63ba057877573dbb3171a8c7ae698cf1bc.tar.bz2
rneovim-e63fdf63ba057877573dbb3171a8c7ae698cf1bc.zip
Merge pull request #11133 from blueyed/backports
[release-0.4] backports
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 5bcd2c808d..f4aa10ecf5 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -871,7 +871,7 @@ static void win_update(win_T *wp)
if (wp->w_lines[0].wl_lnum != wp->w_topline)
i += diff_check_fill(wp, wp->w_lines[0].wl_lnum)
- wp->w_old_topfill;
- if (i < wp->w_grid.Rows - 2) { // less than a screen off
+ if (i != 0 && i < wp->w_grid.Rows - 2) { // less than a screen off
// Try to insert the correct number of lines.
// If not the last window, delete the lines at the bottom.
// win_ins_lines may fail when the terminal can't do it.
@@ -4007,7 +4007,7 @@ win_line (
break;
}
- ++vcol;
+ vcol += cells;
}
}