Permalink
Browse files

updated for version 7.4.280

Problem:    When using a session file the relative position of the cursor is
            not restored if there is another tab. (Nobuhiro Takasaki)
Solution:   Update w_wrow before calculating the fraction.
  • Loading branch information...
brammool committed May 7, 2014
1 parent 1b1063a commit 56b3bf89aa2021d20afabd8ec7b513beb1b8df25
Showing with 15 additions and 5 deletions.
  1. +2 −0 src/version.c
  2. +13 −5 src/window.c
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
280,
/**/
279,
/**/
@@ -5623,7 +5623,7 @@ set_fraction(wp)
win_T *wp;
{
wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT
+ FRACTION_MULT / 2) / (long)wp->w_height;
+ wp->w_height / 2) / (long)wp->w_height;
}
/*
@@ -5638,6 +5638,7 @@ win_new_height(wp, height)
{
linenr_T lnum;
int sline, line_size;
int prev_height = wp->w_height;
/* Don't want a negative height. Happens when splitting a tiny window.
* Will equalize heights soon to fix it. */
@@ -5646,8 +5647,13 @@ win_new_height(wp, height)
if (wp->w_height == height)
return; /* nothing to do */
if (wp->w_wrow != wp->w_prev_fraction_row && wp->w_height > 0)
set_fraction(wp);
if (wp->w_height > 0)
{
if (wp == curwin)
validate_cursor(); /* w_wrow needs to be valid */
if (wp->w_wrow != wp->w_prev_fraction_row)
set_fraction(wp);
}
wp->w_height = height;
wp->w_skipcol = 0;
@@ -5667,7 +5673,8 @@ win_new_height(wp, height)
lnum = wp->w_cursor.lnum;
if (lnum < 1) /* can happen when starting up */
lnum = 1;
wp->w_wrow = ((long)wp->w_fraction * (long)height - 1L) / FRACTION_MULT;
wp->w_wrow = ((long)wp->w_fraction * (long)height - 1L
+ FRACTION_MULT / 2) / FRACTION_MULT;
line_size = plines_win_col(wp, lnum, (long)(wp->w_cursor.col)) - 1;
sline = wp->w_wrow - line_size;
@@ -5757,7 +5764,8 @@ win_new_height(wp, height)
update_topline();
curs_columns(FALSE); /* validate w_wrow */
}
wp->w_prev_fraction_row = wp->w_wrow;
if (prev_height > 0)
wp->w_prev_fraction_row = wp->w_wrow;
win_comp_scroll(wp);
redraw_win_later(wp, SOME_VALID);

0 comments on commit 56b3bf8

Please sign in to comment.