aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-12 09:08:31 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-10-01 22:27:43 -0400
commit6ed20ff25cd738ab2b9e79af8e3a9c37ba52dbcf (patch)
tree5265b6ecc73af153630bac58ebdfef3376a2e174 /src/nvim/window.c
parente8144d204c02be1fb4e248420610ec98074ae9f9 (diff)
downloadrneovim-6ed20ff25cd738ab2b9e79af8e3a9c37ba52dbcf.tar.gz
rneovim-6ed20ff25cd738ab2b9e79af8e3a9c37ba52dbcf.tar.bz2
rneovim-6ed20ff25cd738ab2b9e79af8e3a9c37ba52dbcf.zip
vim-patch:8.1.1327: unnecessary scroll after horizontal split
Problem: Unnecessary scroll after horizontal split. Solution: Don't adjust to fraction if all the text fits in the window. (Martin Kunev, closes vim/vim#4367) https://github.com/vim/vim/commit/a9b2535f44f3265940a18d08520a9ad4ef7bda82
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index d7df048588..1f23646bdf 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -5610,10 +5610,13 @@ void scroll_to_fraction(win_T *wp, int prev_height)
int sline, line_size;
int height = wp->w_height_inner;
- // Don't change w_topline when height is zero. Don't set w_topline when
- // 'scrollbind' is set and this isn't the current window.
+ // Don't change w_topline in any of these cases:
+ // - window height is 0
+ // - 'scrollbind' is set and this isn't the current window
+ // - window height is sufficient to display the whole buffer
if (height > 0
&& (!wp->w_p_scb || wp == curwin)
+ && (height < wp->w_buffer->b_ml.ml_line_count)
) {
/*
* Find a value for w_topline that shows the cursor at the same