Mercurial > vim
changeset 6834:8730db0c187b v7.4.738
patch 7.4.738
Problem: Can't compile without the syntax highlighting feature.
Solution: Add #ifdef around use of w_p_cul. (Hirohito Higashi)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 10 Jun 2015 12:16:47 +0200 |
| parents | 7a8dcf699b22 |
| children | ee39b0c5d55e |
| files | src/normal.c src/screen.c src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -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); } }
--- a/src/screen.c +++ b/src/screen.c @@ -3750,24 +3750,24 @@ win_line(wp, lnum, startrow, endrow, noc if (draw_state == WL_BRI - 1 && n_extra == 0) { draw_state = WL_BRI; + if (wp->w_p_bri && n_extra == 0 && row != startrow # ifdef FEAT_DIFF -# endif - if (wp->w_p_bri && n_extra == 0 && row != startrow -#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,