diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-03-02 01:48:21 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-03-02 01:48:21 -0500 |
| commit | 576c5f7b74bfa46ba4c7290b5e5b951d3ee2d0bc (patch) | |
| tree | fa804260b5057ee60e01ed31986105fd7c4fffcd /src | |
| parent | badf227e6ff377a2673f4c4b0b711b91d93a30bf (diff) | |
| parent | 63606bb4099c3df049a24fd31907553682e6fd09 (diff) | |
| download | rneovim-576c5f7b74bfa46ba4c7290b5e5b951d3ee2d0bc.tar.gz rneovim-576c5f7b74bfa46ba4c7290b5e5b951d3ee2d0bc.tar.bz2 rneovim-576c5f7b74bfa46ba4c7290b5e5b951d3ee2d0bc.zip | |
Merge pull request #4323 from watiko/vim-7.4.961
vim-patch:7.4.961
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/normal.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | src/nvim/window.c | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index f5fb47568e..2895816b8f 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -4099,6 +4099,7 @@ dozet: case 't': scroll_cursor_top(0, true); redraw_later(VALID); + set_fraction(curwin); break; /* "z." and "zz": put cursor in middle of screen */ @@ -4107,6 +4108,7 @@ dozet: case 'z': scroll_cursor_halfway(true); redraw_later(VALID); + set_fraction(curwin); break; /* "z^", "z-" and "zb": put cursor at bottom of screen */ @@ -4127,6 +4129,7 @@ dozet: case 'b': scroll_cursor_bot(0, true); redraw_later(VALID); + set_fraction(curwin); break; /* "zH" - scroll screen right half-page */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 064a853b4c..bc10187aa3 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -329,7 +329,7 @@ static int included_patches[] = { // 964 NA 963, // 962 NA - // 961, + 961, // 960 NA // 959 NA // 958, diff --git a/src/nvim/window.c b/src/nvim/window.c index b79aa366e5..1b8c953596 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -4624,10 +4624,8 @@ void win_drag_vsep_line(win_T *dragwin, int offset) #define FRACTION_MULT 16384L -/* - * Set wp->w_fraction for the current w_wrow and w_height. - */ -static void set_fraction(win_T *wp) +// Set wp->w_fraction for the current w_wrow and w_height. +void set_fraction(win_T *wp) { wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT + wp->w_height / 2) / (long)wp->w_height; |