diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-05-18 18:54:25 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-01 22:27:44 -0400 |
| commit | 90c2abc53faed9aab8ad71395068e7b09d6dea85 (patch) | |
| tree | 7faf46e1c6ea015a9adbfdb40e9692e47d73f702 | |
| parent | 6ed20ff25cd738ab2b9e79af8e3a9c37ba52dbcf (diff) | |
| download | rneovim-90c2abc53faed9aab8ad71395068e7b09d6dea85.tar.gz rneovim-90c2abc53faed9aab8ad71395068e7b09d6dea85.tar.bz2 rneovim-90c2abc53faed9aab8ad71395068e7b09d6dea85.zip | |
vim-patch:8.1.1347: fractional scroll position not restored after closing window
Problem: Fractional scroll position not restored after closing window.
Solution: Do restore fraction if topline is not one.
https://github.com/vim/vim/commit/bd2d68c2f42c7689f681aeaf82606d17f8a0312f
| -rw-r--r-- | src/nvim/testdir/test_window_cmd.vim | 30 | ||||
| -rw-r--r-- | src/nvim/window.c | 5 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim index c41f4f9412..43c1f06c44 100644 --- a/src/nvim/testdir/test_window_cmd.vim +++ b/src/nvim/testdir/test_window_cmd.vim @@ -758,16 +758,8 @@ endfunc func Test_split_noscroll() let so_save = &so - new - only - - " Make sure windows can hold all content after split. - for i in range(1, 20) - wincmd + - redraw! - endfor - - call setline (1, range(1, 8)) + enew + call setline(1, range(1, 8)) normal 100% split @@ -782,12 +774,20 @@ func Test_split_noscroll() call assert_equal(1, info1.topline) call assert_equal(1, info2.topline) - " Restore original state. - for i in range(1, 20) - wincmd - - redraw! - endfor + " window that fits all lines by itself, but not when split: closing other + " window should restore fraction. only! + call setline(1, range(1, &lines - 10)) + exe &lines / 4 + let winid1 = win_getid() + let info1 = getwininfo(winid1)[0] + call assert_equal(1, info1.topline) + new + redraw + close + let info1 = getwininfo(winid1)[0] + call assert_equal(1, info1.topline) + bwipe! let &so = so_save endfunc diff --git a/src/nvim/window.c b/src/nvim/window.c index 1f23646bdf..4d8eaa9dcc 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5613,10 +5613,11 @@ void scroll_to_fraction(win_T *wp, int prev_height) // 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 + // - window height is sufficient to display the whole buffer and first line + // is visible. if (height > 0 && (!wp->w_p_scb || wp == curwin) - && (height < wp->w_buffer->b_ml.ml_line_count) + && (height < wp->w_buffer->b_ml.ml_line_count || wp->w_topline > 1) ) { /* * Find a value for w_topline that shows the cursor at the same |