Skip to content

Commit

Permalink
patch 7.4.961
Browse files Browse the repository at this point in the history
Problem:    Test107 fails in some circunstances.
Solution:   When using "zt", "zb" and "z=" recompute the fraction.
  • Loading branch information
brammool committed Dec 5, 2015
1 parent 90f5d0a commit 9dc2ce3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/normal.c
Expand Up @@ -4880,6 +4880,7 @@ nv_zet(cap)

case 't': scroll_cursor_top(0, TRUE);
redraw_later(VALID);
set_fraction(curwin);
break;

/* "z." and "zz": put cursor in middle of screen */
Expand All @@ -4888,6 +4889,7 @@ nv_zet(cap)

case 'z': scroll_cursor_halfway(TRUE);
redraw_later(VALID);
set_fraction(curwin);
break;

/* "z^", "z-" and "zb": put cursor at bottom of screen */
Expand All @@ -4910,6 +4912,7 @@ nv_zet(cap)

case 'b': scroll_cursor_bot(0, TRUE);
redraw_later(VALID);
set_fraction(curwin);
break;

/* "zH" - scroll screen right half-page */
Expand Down
1 change: 1 addition & 0 deletions src/proto/window.pro
Expand Up @@ -53,6 +53,7 @@ void win_setwidth_win __ARGS((int width, win_T *wp));
void win_setminheight __ARGS((void));
void win_drag_status_line __ARGS((win_T *dragwin, int offset));
void win_drag_vsep_line __ARGS((win_T *dragwin, int offset));
void set_fraction __ARGS((win_T *wp));
void win_new_height __ARGS((win_T *wp, int height));
void win_new_width __ARGS((win_T *wp, int width));
void win_comp_scroll __ARGS((win_T *wp));
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -741,6 +741,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
961,
/**/
960,
/**/
Expand Down
3 changes: 1 addition & 2 deletions src/window.c
Expand Up @@ -75,7 +75,6 @@ static int frame_check_width __ARGS((frame_T *topfrp, int width));
#endif /* FEAT_WINDOWS */

static win_T *win_alloc __ARGS((win_T *after, int hidden));
static void set_fraction __ARGS((win_T *wp));

#define URL_SLASH 1 /* path_is_url() has found "://" */
#define URL_BACKSLASH 2 /* path_is_url() has found ":\\" */
Expand Down Expand Up @@ -5828,7 +5827,7 @@ win_drag_vsep_line(dragwin, offset)
/*
* Set wp->w_fraction for the current w_wrow and w_height.
*/
static void
void
set_fraction(wp)
win_T *wp;
{
Expand Down

0 comments on commit 9dc2ce3

Please sign in to comment.