Skip to content

Commit d1413d9

Browse files
committed
patch 7.4.1473
Problem: Can't build without the autocommand feature. Solution: Add #ifdefs. (Yegappan Lakshmanan)
1 parent 4ca812b commit d1413d9

4 files changed

Lines changed: 18 additions & 1 deletion

File tree

src/edit.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,9 @@ ins_redraw(
15901590
curwin->w_p_cole > 0
15911591
# endif
15921592
)
1593+
# ifdef FEAT_AUTOCMD
15931594
&& !equalpos(last_cursormoved, curwin->w_cursor)
1595+
# endif
15941596
# ifdef FEAT_INS_EXPAND
15951597
&& !pum_visible()
15961598
# endif
@@ -1616,12 +1618,16 @@ ins_redraw(
16161618
# ifdef FEAT_CONCEAL
16171619
if (curwin->w_p_cole > 0)
16181620
{
1621+
# ifdef FEAT_AUTOCMD
16191622
conceal_old_cursor_line = last_cursormoved.lnum;
1623+
# endif
16201624
conceal_new_cursor_line = curwin->w_cursor.lnum;
16211625
conceal_update_lines = TRUE;
16221626
}
16231627
# endif
1628+
# ifdef FEAT_AUTOCMD
16241629
last_cursormoved = curwin->w_cursor;
1630+
# endif
16251631
}
16261632
#endif
16271633

src/main.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,10 @@ main_loop(
11761176
curwin->w_p_cole > 0
11771177
# endif
11781178
)
1179-
&& !equalpos(last_cursormoved, curwin->w_cursor))
1179+
# ifdef FEAT_AUTOCMD
1180+
&& !equalpos(last_cursormoved, curwin->w_cursor)
1181+
# endif
1182+
)
11801183
{
11811184
# ifdef FEAT_AUTOCMD
11821185
if (has_cursormoved())
@@ -1186,12 +1189,16 @@ main_loop(
11861189
# ifdef FEAT_CONCEAL
11871190
if (curwin->w_p_cole > 0)
11881191
{
1192+
# ifdef FEAT_AUTOCMD
11891193
conceal_old_cursor_line = last_cursormoved.lnum;
1194+
# endif
11901195
conceal_new_cursor_line = curwin->w_cursor.lnum;
11911196
conceal_update_lines = TRUE;
11921197
}
11931198
# endif
1199+
# ifdef FEAT_AUTOCMD
11941200
last_cursormoved = curwin->w_cursor;
1201+
# endif
11951202
}
11961203
#endif
11971204

src/syntax.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6342,9 +6342,11 @@ ex_ownsyntax(exarg_T *eap)
63426342
if (old_value != NULL)
63436343
old_value = vim_strsave(old_value);
63446344

6345+
#ifdef FEAT_AUTOCMD
63456346
/* Apply the "syntax" autocommand event, this finds and loads the syntax
63466347
* file. */
63476348
apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf);
6349+
#endif
63486350

63496351
/* move value of b:current_syntax to w:current_syntax */
63506352
new_value = get_var_value((char_u *)"b:current_syntax");

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1473,
746748
/**/
747749
1472,
748750
/**/

0 commit comments

Comments
 (0)