aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 7.4.738

Browse Source 
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:
Bram Moolenaar
2015-06-10 12:16:47 +02:00
parent 6e8d3b0d41
commit d710e0d247
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/normal.c
View File

@@ -8487,9 +8487,11 @@ n_opencmd(cap)
/* When '#' is in 'cpoptions' ignore the count. */ /* When '#' is in 'cpoptions' ignore the count. */
if (vim_strchr(p_cpo, CPO_HASH) != NULL) if (vim_strchr(p_cpo, CPO_HASH) != NULL)
cap->count1 = 1; cap->count1 = 1;
#ifdef FEAT_SYN_HL
if (curwin->w_p_cul) if (curwin->w_p_cul)
/* force redraw of cursorline */ /* force redraw of cursorline */
curwin->w_valid &= ~VALID_CROW; curwin->w_valid &= ~VALID_CROW;
#endif
invoke_edit(cap, FALSE, cap->cmdchar, TRUE); invoke_edit(cap, FALSE, cap->cmdchar, TRUE);
} }
} }

12
src/screen.c
View File

@@ -3750,24 +3750,24 @@ win_line(wp, lnum, startrow, endrow, nochange)
if (draw_state == WL_BRI - 1 && n_extra == 0) if (draw_state == WL_BRI - 1 && n_extra == 0)
{ {
draw_state = WL_BRI; draw_state = WL_BRI;
# ifdef FEAT_DIFF
# endif
if (wp->w_p_bri && n_extra == 0 && row != startrow if (wp->w_p_bri && n_extra == 0 && row != startrow
#ifdef FEAT_DIFF # ifdef FEAT_DIFF
&& filler_lines == 0 && filler_lines == 0
#endif # endif
) )
{ {
char_attr = 0; /* was: hl_attr(HLF_AT); */ char_attr = 0; /* was: hl_attr(HLF_AT); */
#ifdef FEAT_DIFF # ifdef FEAT_DIFF
if (diff_hlf != (hlf_T)0) if (diff_hlf != (hlf_T)0)
{ {
char_attr = hl_attr(diff_hlf); char_attr = hl_attr(diff_hlf);
# ifdef FEAT_SYN_HL
if (wp->w_p_cul && lnum == wp->w_cursor.lnum) if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
char_attr = hl_combine_attr(char_attr, char_attr = hl_combine_attr(char_attr,
hl_attr(HLF_CUL)); hl_attr(HLF_CUL));
# endif
} }
#endif # endif
p_extra = NULL; p_extra = NULL;
c_extra = ' '; c_extra = ' ';
n_extra = get_breakindent_win(wp, n_extra = get_breakindent_win(wp,

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
738,
/**/ /**/
737, 737,
/**/ /**/