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:9.1.0077: Unnecessary call to redraw_for_cursorline() in nv_mousescroll() (#27359)

Browse Source 
Problem:  The call to redraw_for_cursorline() in nv_mousescroll() is
          unnecessary because redraw_for_cursorline() only sets redraw
          type to UPD_VALID, and all code paths in do_mousescroll()
          already set redraw type to at least UPD_VALID.
Solution: Remove call to redraw_for_cursorline() in nv_mousescroll().
          (zeertzjq)

closes: vim/vim#13979

3f1b5312e0
This commit is contained in:
zeertzjq 2024-02-06 18:05:06 +08:00 committed by GitHub
parent d6fac187f1
commit a945a31e76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/drawscreen.c
View File

@ -2864,15 +2864,3 @@ bool win_cursorline_standout(const win_T *wp)
{ {
return wp->w_p_cul || (wp->w_p_cole > 0 && !conceal_cursor_line(wp)); return wp->w_p_cul || (wp->w_p_cole > 0 && !conceal_cursor_line(wp));
} }
/// Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is set.
/// Also when concealing is on and 'concealcursor' is not active.
void redraw_for_cursorline(win_T *wp)
FUNC_ATTR_NONNULL_ALL
{
if ((wp->w_valid & VALID_CROW) == 0 && !pum_visible()
&& (wp->w_p_rnu || win_cursorline_standout(wp))) {
// win_line() will redraw the number column and cursorline only.
redraw_later(wp, UPD_VALID);
}
}

3
src/nvim/mouse.c
View File

@ -1571,9 +1571,6 @@ void nv_mousescroll(cmdarg_T *cap)
// Call the common mouse scroll function shared with other modes. // Call the common mouse scroll function shared with other modes.
do_mousescroll(cap); do_mousescroll(cap);
if (curwin != old_curwin && curwin->w_p_cul) {
redraw_for_cursorline(curwin);
}
curwin->w_redr_status = true; curwin->w_redr_status = true;
curwin = old_curwin; curwin = old_curwin;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;

12
src/nvim/move.c
View File

@ -135,6 +135,18 @@ static void comp_botline(win_T *wp)
win_check_anchored_floats(wp); win_check_anchored_floats(wp);
} }
/// Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is set.
/// Also when concealing is on and 'concealcursor' is not active.
static void redraw_for_cursorline(win_T *wp)
FUNC_ATTR_NONNULL_ALL
{
if ((wp->w_valid & VALID_CROW) == 0 && !pum_visible()
&& (wp->w_p_rnu || win_cursorline_standout(wp))) {
// win_line() will redraw the number column and cursorline only.
redraw_later(wp, UPD_VALID);
}
}
/// Redraw when w_virtcol changes and /// Redraw when w_virtcol changes and
/// - 'cursorcolumn' is set, or /// - 'cursorcolumn' is set, or
/// - 'cursorlineopt' contains "screenline", or /// - 'cursorlineopt' contains "screenline", or