kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 11:15:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4323 from watiko/vim-7.4.961

Browse Source 
vim-patch:7.4.961
This commit is contained in:
Justin M. Keyes 2016-03-02 01:48:21 -05:00
commit 576c5f7b74
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/normal.c
View File

@ -4099,6 +4099,7 @@ dozet:
case 't': scroll_cursor_top(0, true); case 't': scroll_cursor_top(0, true);
redraw_later(VALID); redraw_later(VALID);
set_fraction(curwin);
break; break;
/* "z." and "zz": put cursor in middle of screen */ /* "z." and "zz": put cursor in middle of screen */
@ -4107,6 +4108,7 @@ dozet:
case 'z': scroll_cursor_halfway(true); case 'z': scroll_cursor_halfway(true);
redraw_later(VALID); redraw_later(VALID);
set_fraction(curwin);
break; break;
/* "z^", "z-" and "zb": put cursor at bottom of screen */ /* "z^", "z-" and "zb": put cursor at bottom of screen */
@ -4127,6 +4129,7 @@ dozet:
case 'b': scroll_cursor_bot(0, true); case 'b': scroll_cursor_bot(0, true);
redraw_later(VALID); redraw_later(VALID);
set_fraction(curwin);
break; break;
/* "zH" - scroll screen right half-page */ /* "zH" - scroll screen right half-page */

2
src/nvim/version.c
View File

@ -329,7 +329,7 @@ static int included_patches[] = {
// 964 NA // 964 NA
963, 963,
// 962 NA // 962 NA
// 961, 961,
// 960 NA // 960 NA
// 959 NA // 959 NA
// 958, // 958,

6
src/nvim/window.c
View File

@ -4624,10 +4624,8 @@ void win_drag_vsep_line(win_T *dragwin, int offset)
#define FRACTION_MULT 16384L #define FRACTION_MULT 16384L
/* // Set wp->w_fraction for the current w_wrow and w_height.
* Set wp->w_fraction for the current w_wrow and w_height. void set_fraction(win_T *wp)
*/
static void set_fraction(win_T *wp)
{ {
wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT + wp->w_height / 2) wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT + wp->w_height / 2)
/ (long)wp->w_height; / (long)wp->w_height;