IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.550 #2510

Browse Source 
Problem:    curs_rows() function is always called with the second argument
            false.
Solution:   Remove the argument. (Christian Brabandt)
            validate_botline_win() can then also be removed.

https://github.com/vim/vim/releases/tag/v7-4-550
This commit is contained in:
David Bürgin 2015-04-25 20:44:29 +02:00 committed by Michael Reed
parent deeee5bfab
commit f6d76c0813
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/move.c
View File

@ -487,15 +487,6 @@ void validate_botline(void)
comp_botline(curwin); comp_botline(curwin);
} }
/*
* Make sure the value of wp->w_botline is valid.
*/
static void validate_botline_win(win_T *wp)
{
if (!(wp->w_valid & VALID_BOTLINE))
comp_botline(wp);
}
/* /*
* Mark curwin->w_botline as invalid (because of some change in the buffer). * Mark curwin->w_botline as invalid (because of some change in the buffer).
*/ */
@ -538,14 +529,8 @@ void validate_cursor(void)
/* /*
* Compute wp->w_cline_row and wp->w_cline_height, based on the current value * Compute wp->w_cline_row and wp->w_cline_height, based on the current value
* of wp->w_topline. * of wp->w_topline.
*
* Returns OK when cursor is in the window, FAIL when it isn't.
*/ */
static void static void curs_rows(win_T *wp)
curs_rows (
win_T *wp,
int do_botline /* also compute w_botline */
)
{ {
linenr_T lnum; linenr_T lnum;
int i; int i;
@ -625,10 +610,6 @@ curs_rows (
redraw_for_cursorline(curwin); redraw_for_cursorline(curwin);
wp->w_valid |= VALID_CROW|VALID_CHEIGHT; wp->w_valid |= VALID_CROW|VALID_CHEIGHT;
/* validate botline too, if update_screen doesn't do it */
if (do_botline && all_invalid)
validate_botline_win(wp);
} }
/* /*
@ -766,11 +747,10 @@ curs_columns (
*/ */
update_topline(); update_topline();
/* // Next make sure that w_cline_row is valid.
* Next make sure that w_cline_row is valid. if (!(curwin->w_valid & VALID_CROW)) {
*/ curs_rows(curwin);
if (!(curwin->w_valid & VALID_CROW)) }
curs_rows(curwin, FALSE);
/* /*
* Compute the number of virtual columns. * Compute the number of virtual columns.

2
src/nvim/version.c
View File

@ -219,7 +219,7 @@ static int included_patches[] = {
//553, //553,
552, 552,
551, 551,
//550, 550,
549, 549,
//548 NA //548 NA
547, 547,