mirror of
https://github.com/neovim/neovim.git
synced 2025-09-24 03:58:32 +00:00
Merge branch 'master' into add-scroll-events
This commit is contained in:
@@ -903,6 +903,10 @@ normal_end:
|
||||
|
||||
msg_nowait = false;
|
||||
|
||||
if (finish_op) {
|
||||
set_reg_var(get_default_register_name());
|
||||
}
|
||||
|
||||
// Reset finish_op, in case it was set
|
||||
s->c = finish_op;
|
||||
finish_op = false;
|
||||
@@ -3615,7 +3619,7 @@ void check_scrollbind(linenr_T topline_diff, long leftcol_diff)
|
||||
scrolldown(-y, false);
|
||||
}
|
||||
|
||||
redraw_later(VALID);
|
||||
redraw_later(curwin, VALID);
|
||||
cursor_correct();
|
||||
curwin->w_redr_status = true;
|
||||
}
|
||||
@@ -4158,7 +4162,7 @@ void scroll_redraw(int up, long count)
|
||||
coladvance(curwin->w_curswant);
|
||||
if (moved)
|
||||
curwin->w_viewport_invalid = true;
|
||||
redraw_later(VALID);
|
||||
redraw_later(curwin, VALID);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -4256,7 +4260,7 @@ dozet:
|
||||
FALLTHROUGH;
|
||||
|
||||
case 't': scroll_cursor_top(0, true);
|
||||
redraw_later(VALID);
|
||||
redraw_later(curwin, VALID);
|
||||
set_fraction(curwin);
|
||||
break;
|
||||
|
||||
@@ -4265,7 +4269,7 @@ dozet:
|
||||
FALLTHROUGH;
|
||||
|
||||
case 'z': scroll_cursor_halfway(true);
|
||||
redraw_later(VALID);
|
||||
redraw_later(curwin, VALID);
|
||||
set_fraction(curwin);
|
||||
break;
|
||||
|
||||
@@ -4286,7 +4290,7 @@ dozet:
|
||||
FALLTHROUGH;
|
||||
|
||||
case 'b': scroll_cursor_bot(0, true);
|
||||
redraw_later(VALID);
|
||||
redraw_later(curwin, VALID);
|
||||
set_fraction(curwin);
|
||||
break;
|
||||
|
||||
@@ -4333,7 +4337,7 @@ dozet:
|
||||
col = 0;
|
||||
if (curwin->w_leftcol != col) {
|
||||
curwin->w_leftcol = col;
|
||||
redraw_later(NOT_VALID);
|
||||
redraw_later(curwin, NOT_VALID);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4352,7 +4356,7 @@ dozet:
|
||||
}
|
||||
if (curwin->w_leftcol != col) {
|
||||
curwin->w_leftcol = col;
|
||||
redraw_later(NOT_VALID);
|
||||
redraw_later(curwin, NOT_VALID);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4705,7 +4709,7 @@ static void nv_clear(cmdarg_T *cap)
|
||||
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
|
||||
wp->w_s->b_syn_slow = false;
|
||||
}
|
||||
redraw_later(CLEAR);
|
||||
redraw_later(curwin, CLEAR);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6856,7 +6860,7 @@ static void nv_g_cmd(cmdarg_T *cap)
|
||||
} else {
|
||||
if (cap->count1 > 1) {
|
||||
// if it fails, let the cursor still move to the last char
|
||||
cursor_down(cap->count1 - 1, false);
|
||||
(void)cursor_down(cap->count1 - 1, false);
|
||||
}
|
||||
i = curwin->w_leftcol + curwin->w_width_inner - col_off - 1;
|
||||
coladvance((colnr_T)i);
|
||||
|
Reference in New Issue
Block a user