thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0206: redraw flags are not named specifically

Browse Source 
Problem:    Redraw flags are not named specifically.
Solution:   Prefix "UPD_" to the flags, for UPDate_screen().
This commit is contained in:
Bram Moolenaar
2022-08-14 14:17:45 +01:00
parent 28c9f89571
commit a4d158b3c8
64 changed files with 382 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/move.c
View File

@@ -131,7 +131,7 @@ redraw_for_cursorline(win_T *wp)
&& !pum_visible())
{
// win_line() will redraw the number column and cursorline only.
redraw_win_later(wp, VALID);
redraw_win_later(wp, UPD_VALID);
}
}
@@ -145,12 +145,13 @@ redraw_for_cursorcolumn(win_T *wp)
{
if ((wp->w_valid & VALID_VIRTCOL) == 0 && !pum_visible())
{
// When 'cursorcolumn' is set need to redraw with SOME_VALID.
// When 'cursorcolumn' is set need to redraw with UPD_SOME_VALID.
if (wp->w_p_cuc)
redraw_win_later(wp, SOME_VALID);
// When 'cursorlineopt' contains "screenline" need to redraw with VALID.
redraw_win_later(wp, UPD_SOME_VALID);
// When 'cursorlineopt' contains "screenline" need to redraw with
// UPD_VALID.
else if (wp->w_p_cul && (wp->w_p_culopt_flags & CULOPT_SCRLINE))
redraw_win_later(wp, VALID);
redraw_win_later(wp, UPD_VALID);
}
}
#endif
@@ -218,7 +219,7 @@ update_topline(void)
if (BUFEMPTY()) // special case - file is empty
{
if (curwin->w_topline != 1)
redraw_later(NOT_VALID);
redraw_later(UPD_NOT_VALID);
curwin->w_topline = 1;
curwin->w_botline = 2;
curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
@@ -401,10 +402,10 @@ update_topline(void)
if (curwin->w_skipcol != 0)
{
curwin->w_skipcol = 0;
redraw_later(NOT_VALID);
redraw_later(UPD_NOT_VALID);
}
else
redraw_later(VALID);
redraw_later(UPD_VALID);
// May need to set w_skipcol when cursor in w_topline.
if (curwin->w_cursor.lnum == curwin->w_topline)
validate_cursor();
@@ -522,7 +523,7 @@ changed_window_setting_win(win_T *wp)
wp->w_lines_valid = 0;
changed_line_abv_curs_win(wp);
wp->w_valid &= ~(VALID_BOTLINE|VALID_BOTLINE_AP|VALID_TOPLINE);
redraw_win_later(wp, NOT_VALID);
redraw_win_later(wp, UPD_NOT_VALID);
}
/*
@@ -552,7 +553,7 @@ set_topline(win_T *wp, linenr_T lnum)
#endif
wp->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_TOPLINE);
// Don't set VALID_TOPLINE here, 'scrolloff' needs to be checked.
redraw_later(VALID);
redraw_later(UPD_VALID);
}
/*
@@ -1089,7 +1090,7 @@ curs_columns(
{
curwin->w_leftcol = new_leftcol;
// screen has to be redrawn with new curwin->w_leftcol
redraw_later(NOT_VALID);
redraw_later(UPD_NOT_VALID);
}
}
curwin->w_wcol -= curwin->w_leftcol;
@@ -1202,7 +1203,7 @@ curs_columns(
else
curwin->w_skipcol = 0;
if (prev_skipcol != curwin->w_skipcol)
redraw_later(NOT_VALID);
redraw_later(UPD_NOT_VALID);
#ifdef FEAT_SYN_HL
redraw_for_cursorcolumn(curwin);
@@ -2672,7 +2673,7 @@ onepage(int dir, long count)
#endif
}
redraw_later(VALID);
redraw_later(UPD_VALID);
return retval;
}
@@ -2924,7 +2925,7 @@ halfpage(int flag, linenr_T Prenum)
#endif
cursor_correct();
beginline(BL_SOL | BL_FIX);
redraw_later(VALID);
redraw_later(UPD_VALID);
}
void
@@ -2978,7 +2979,7 @@ do_check_cursorbind(void)
// Correct cursor for multi-byte character.
if (has_mbyte)
mb_adjust_cursor();
redraw_later(VALID);
redraw_later(UPD_VALID);
// Only scroll when 'scrollbind' hasn't done this.
if (!curwin->w_p_scb)