mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 15:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4230 from jbradaric/vim-7.4.853

Browse Source 
vim-patch:7.4.{853,856}
This commit is contained in:
Justin M. Keyes
2016-02-17 04:08:57 -05:00
parent 9198b06ea6 313c24a31b
commit af1745a763
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/move.c
View File

@@ -1288,9 +1288,10 @@ void scroll_cursor_top(int min_scroll, int always)
* - at least 'scrolloff' lines above and below the cursor * - at least 'scrolloff' lines above and below the cursor
*/ */
validate_cheight(); validate_cheight();
int used = curwin->w_cline_height; int used = curwin->w_cline_height; // includes filler lines above
if (curwin->w_cursor.lnum < curwin->w_topline) if (curwin->w_cursor.lnum < curwin->w_topline) {
scrolled = used; scrolled = used;
}
if (hasFolding(curwin->w_cursor.lnum, &top, &bot)) { if (hasFolding(curwin->w_cursor.lnum, &top, &bot)) {
--top; --top;
@@ -1301,9 +1302,10 @@ void scroll_cursor_top(int min_scroll, int always)
} }
new_topline = top + 1; new_topline = top + 1;
/* count filler lines of the cursor window as context */ // "used" already contains the number of filler lines above, don't add it
// again.
// Hide filler lines above cursor line by adding them to "extra".
int extra = diff_check_fill(curwin, curwin->w_cursor.lnum); int extra = diff_check_fill(curwin, curwin->w_cursor.lnum);
used += extra;
/* /*
* Check if the lines from "top" to "bot" fit in the window. If they do, * Check if the lines from "top" to "bot" fit in the window. If they do,
@@ -1312,7 +1314,7 @@ void scroll_cursor_top(int min_scroll, int always)
while (top > 0) { while (top > 0) {
int i = hasFolding(top, &top, NULL) int i = hasFolding(top, &top, NULL)
? 1 // count one logical line for a sequence of folded lines ? 1 // count one logical line for a sequence of folded lines
: plines(top); : plines_nofill(top);
used += i; used += i;
if (extra + i <= off && bot < curbuf->b_ml.ml_line_count) { if (extra + i <= off && bot < curbuf->b_ml.ml_line_count) {
if (hasFolding(bot, NULL, &bot)) if (hasFolding(bot, NULL, &bot))

4
src/nvim/version.c
View File

@@ -432,10 +432,10 @@ static int included_patches[] = {
// 859, // 859,
858, 858,
// 857, // 857,
// 856, 856,
// 855 NA // 855 NA
// 854 NA // 854 NA
// 853, 853,
// 852 NA // 852 NA
// 851 NA // 851 NA
// 850 NA // 850 NA