patch 7.4.738
Problem: Can't compile without the syntax highlighting feature.
Solution: Add #ifdef around use of w_p_cul. (Hirohito Higashi)
diff --git a/src/normal.c b/src/normal.c
index 38a9f81..dc223c2 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -8487,9 +8487,11 @@
/* 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);
}
}
diff --git a/src/screen.c b/src/screen.c
index 917a0ea..379b0f4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3750,24 +3750,24 @@
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,
diff --git a/src/version.c b/src/version.c
index acff490..23a1b13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 738,
+/**/
737,
/**/
736,