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

screen: win_del_lines/win_ins_lines cleanup

Browse Source
This commit is contained in:
Björn Linse 2018-02-21 15:55:21 +01:00
parent 54c0bf6429
commit 464ac8fe2a
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/screen.c
View File

@ -6445,16 +6445,11 @@ void setcursor(void)
/// Returns FAIL if the lines are not inserted, OK for success. /// Returns FAIL if the lines are not inserted, OK for success.
int win_ins_lines(win_T *wp, int row, int line_count, int invalid, int mayclear) int win_ins_lines(win_T *wp, int row, int line_count, int invalid, int mayclear)
{ {
if (invalid) if (wp->w_height < 5) {
wp->w_lines_valid = 0;
if (wp->w_height < 5)
return FAIL; return FAIL;
}
if (line_count > wp->w_height - row) return win_do_lines(wp, row, line_count, invalid, mayclear, false);
line_count = wp->w_height - row;
return win_do_lines(wp, row, line_count, mayclear, FALSE);
} }
/// Delete "line_count" window lines at "row" in window "wp". /// Delete "line_count" window lines at "row" in window "wp".
@ -6464,19 +6459,18 @@ int win_ins_lines(win_T *wp, int row, int line_count, int invalid, int mayclear)
/// Return OK for success, FAIL if the lines are not deleted. /// Return OK for success, FAIL if the lines are not deleted.
int win_del_lines(win_T *wp, int row, int line_count, int invalid, int mayclear) int win_del_lines(win_T *wp, int row, int line_count, int invalid, int mayclear)
{ {
if (invalid) return win_do_lines(wp, row, line_count, invalid, mayclear, true);
wp->w_lines_valid = 0;
if (line_count > wp->w_height - row)
line_count = wp->w_height - row;
return win_do_lines(wp, row, line_count, mayclear, TRUE);
} }
// Common code for win_ins_lines() and win_del_lines(). // Common code for win_ins_lines() and win_del_lines().
// Returns OK or FAIL when the work has been done. // Returns OK or FAIL when the work has been done.
static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del) static int win_do_lines(win_T *wp, int row, int line_count,
int invalid, int mayclear, int del)
{ {
if (invalid) {
wp->w_lines_valid = 0;
}
if (!redrawing() || line_count <= 0) { if (!redrawing() || line_count <= 0) {
return FAIL; return FAIL;
} }