mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
patch 7.4.738
Problem: Can't compile without the syntax highlighting feature. Solution: Add #ifdef around use of w_p_cul. (Hirohito Higashi)
This commit is contained in:
@@ -8487,9 +8487,11 @@ n_opencmd(cap)
|
||||
/* When '#' is in 'cpoptions' ignore the count. */
|
||||
if (vim_strchr(p_cpo, CPO_HASH) != NULL)
|
||||
cap->count1 = 1;
|
||||
#ifdef FEAT_SYN_HL
|
||||
if (curwin->w_p_cul)
|
||||
/* force redraw of cursorline */
|
||||
curwin->w_valid &= ~VALID_CROW;
|
||||
#endif
|
||||
invoke_edit(cap, FALSE, cap->cmdchar, TRUE);
|
||||
}
|
||||
}
|
||||
|
12
src/screen.c
12
src/screen.c
@@ -3750,24 +3750,24 @@ win_line(wp, lnum, startrow, endrow, nochange)
|
||||
if (draw_state == WL_BRI - 1 && n_extra == 0)
|
||||
{
|
||||
draw_state = WL_BRI;
|
||||
# ifdef FEAT_DIFF
|
||||
# endif
|
||||
if (wp->w_p_bri && n_extra == 0 && row != startrow
|
||||
#ifdef FEAT_DIFF
|
||||
# ifdef FEAT_DIFF
|
||||
&& filler_lines == 0
|
||||
#endif
|
||||
# endif
|
||||
)
|
||||
{
|
||||
char_attr = 0; /* was: hl_attr(HLF_AT); */
|
||||
#ifdef FEAT_DIFF
|
||||
# ifdef FEAT_DIFF
|
||||
if (diff_hlf != (hlf_T)0)
|
||||
{
|
||||
char_attr = hl_attr(diff_hlf);
|
||||
# ifdef FEAT_SYN_HL
|
||||
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
||||
char_attr = hl_combine_attr(char_attr,
|
||||
hl_attr(HLF_CUL));
|
||||
# endif
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
p_extra = NULL;
|
||||
c_extra = ' ';
|
||||
n_extra = get_breakindent_win(wp,
|
||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
738,
|
||||
/**/
|
||||
737,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user