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.853

Browse Source 
Problem:    "zt" in diff mode does not always work properly. (Gary Johnson)
Solution:   Don't count filler lines twice. (Christian Brabandt)

cf619daa8e
This commit is contained in:
Jurica Bradaric 2016-02-09 23:44:16 +01:00
parent 84281bf675
commit 37288e522a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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,13 @@ 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
int extra = diff_check_fill(curwin, curwin->w_cursor.lnum); // again.
used += extra; // TODO: if filler lines above new top are to be considered as context for
// the current window, leave next statement commented, else hide filler
// lines above cursor line, by adding them to extra
// int extra += diff_check_fill(curwin, curwin->w_cursor.lnum);
int extra = 0;
/* /*
* 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,

2
src/nvim/version.c
View File

@ -435,7 +435,7 @@ static int included_patches[] = {
// 856, // 856,
// 855 NA // 855 NA
// 854 NA // 854 NA
// 853, 853,
// 852 NA // 852 NA
// 851 NA // 851 NA
// 850 NA // 850 NA