forked from aniani/vim
patch 8.2.4557: confusing comment about 'cursorlineopt'
Problem: Confusing comment about 'cursorlineopt'. Solution: Adjust comment. (closes #9939) Add parenthesis around logical OR.
This commit is contained in:
@@ -1182,8 +1182,8 @@ win_line(
|
|||||||
#ifdef FEAT_SYN_HL
|
#ifdef FEAT_SYN_HL
|
||||||
// When 'cursorline' is set highlight the line number of
|
// When 'cursorline' is set highlight the line number of
|
||||||
// the current line differently.
|
// the current line differently.
|
||||||
// When 'cursorlineopt' has "screenline" only highlight
|
// When 'cursorlineopt' does not have "line" only
|
||||||
// the line number itself.
|
// highlight the line number itself.
|
||||||
// TODO: Can we use CursorLine instead of CursorLineNr
|
// TODO: Can we use CursorLine instead of CursorLineNr
|
||||||
// when CursorLineNr isn't set?
|
// when CursorLineNr isn't set?
|
||||||
if (wp->w_p_cul
|
if (wp->w_p_cul
|
||||||
@@ -1191,7 +1191,7 @@ win_line(
|
|||||||
&& (wp->w_p_culopt_flags & CULOPT_NBR)
|
&& (wp->w_p_culopt_flags & CULOPT_NBR)
|
||||||
&& (row == startrow + filler_lines
|
&& (row == startrow + filler_lines
|
||||||
|| (row > startrow + filler_lines
|
|| (row > startrow + filler_lines
|
||||||
&& wp->w_p_culopt_flags & CULOPT_LINE)))
|
&& (wp->w_p_culopt_flags & CULOPT_LINE))))
|
||||||
char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN));
|
char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN));
|
||||||
#endif
|
#endif
|
||||||
if (wp->w_p_rnu && lnum < wp->w_cursor.lnum
|
if (wp->w_p_rnu && lnum < wp->w_cursor.lnum
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
4557,
|
||||||
/**/
|
/**/
|
||||||
4556,
|
4556,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user