diff options
| author | David Bürgin <676c7473@gmail.com> | 2015-04-25 20:44:29 +0200 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-04-25 17:08:40 -0400 |
| commit | f6d76c08139d72324f96cd9cf952d4ec0cdc51a8 (patch) | |
| tree | cfe06f032605d479e12aea26aa2436bdb4f0fa64 | |
| parent | deeee5bfab7c1bf7a62f0e309b59fccc40d092ac (diff) | |
| download | rneovim-f6d76c08139d72324f96cd9cf952d4ec0cdc51a8.tar.gz rneovim-f6d76c08139d72324f96cd9cf952d4ec0cdc51a8.tar.bz2 rneovim-f6d76c08139d72324f96cd9cf952d4ec0cdc51a8.zip | |
vim-patch:7.4.550 #2510
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
| -rw-r--r-- | src/nvim/move.c | 30 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 26 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 65f2853073..ac15d9e927 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -488,15 +488,6 @@ void validate_botline(void) } /* - * 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). */ void invalidate_botline(void) @@ -538,14 +529,8 @@ void validate_cursor(void) /* * Compute wp->w_cline_row and wp->w_cline_height, based on the current value * of wp->w_topline. - * - * Returns OK when cursor is in the window, FAIL when it isn't. */ -static void -curs_rows ( - win_T *wp, - int do_botline /* also compute w_botline */ -) +static void curs_rows(win_T *wp) { linenr_T lnum; int i; @@ -625,10 +610,6 @@ curs_rows ( redraw_for_cursorline(curwin); 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(); - /* - * Next make sure that w_cline_row is valid. - */ - if (!(curwin->w_valid & VALID_CROW)) - curs_rows(curwin, FALSE); + // Next make sure that w_cline_row is valid. + if (!(curwin->w_valid & VALID_CROW)) { + curs_rows(curwin); + } /* * Compute the number of virtual columns. diff --git a/src/nvim/version.c b/src/nvim/version.c index bccce50ece..5a8e1930b0 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -219,7 +219,7 @@ static int included_patches[] = { //553, 552, 551, - //550, + 550, 549, //548 NA 547, |