aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-08-04 19:37:58 +0200
committerGitHub <noreply@github.com>2018-08-04 19:37:58 +0200
commite861da247ea63024179467a9ad1923308951c0f0 (patch)
tree976cd9950743cbf49bd3bef4608c3875e1763c9c /src/nvim/window.c
parenta4c944762315c535fc7986d734e383eccc9f1863 (diff)
parentc51c2f5a65881b2057907338099e12fa19811d41 (diff)
downloadrneovim-e861da247ea63024179467a9ad1923308951c0f0.tar.gz
rneovim-e861da247ea63024179467a9ad1923308951c0f0.tar.bz2
rneovim-e861da247ea63024179467a9ad1923308951c0f0.zip
Merge #8749 from janlazo/clint-tristate
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 274bf72f3b..7582c837c8 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -4848,8 +4848,8 @@ void scroll_to_fraction(win_T *wp, int prev_height)
sline = wp->w_wrow - line_size;
if (sline >= 0) {
- /* Make sure the whole cursor line is visible, if possible. */
- int rows = plines_win(wp, lnum, FALSE);
+ // Make sure the whole cursor line is visible, if possible.
+ const int rows = plines_win(wp, lnum, false);
if (sline > wp->w_height - rows) {
sline = wp->w_height - rows;
@@ -4884,12 +4884,13 @@ void scroll_to_fraction(win_T *wp, int prev_height)
--sline;
break;
}
- --lnum;
- if (lnum == wp->w_topline)
- line_size = plines_win_nofill(wp, lnum, TRUE)
+ lnum--;
+ if (lnum == wp->w_topline) {
+ line_size = plines_win_nofill(wp, lnum, true)
+ wp->w_topfill;
- else
- line_size = plines_win(wp, lnum, TRUE);
+ } else {
+ line_size = plines_win(wp, lnum, true);
+ }
sline -= line_size;
}