# HG changeset patch # User Bram Moolenaar # Date 1375732940 -7200 # Node ID d96f16667cc48d89c380fae29d86286b20040d5b # Parent 42bf9264e64efa2d7ea02fc4ff03d4a7aa05fde8 updated for version 7.4b.015 Problem: Can't compile without the 'acd' feature. Solution: Add #ifdefs. (Kazunobu Kuriyama) diff --git a/src/fileio.c b/src/fileio.c --- a/src/fileio.c +++ b/src/fileio.c @@ -8861,7 +8861,9 @@ aucmd_prepbuf(aco, buf) #ifdef FEAT_WINDOWS int save_ea; #endif +#ifdef FEAT_AUTOCHDIR int save_acd; +#endif /* Find a window that is for the new buffer */ if (buf == curbuf) /* be quick when buf is curbuf */ @@ -8927,14 +8929,18 @@ aucmd_prepbuf(aco, buf) save_ea = p_ea; p_ea = FALSE; +# ifdef FEAT_AUTOCHDIR /* Prevent chdir() call in win_enter_ext(), through do_autochdir(). */ save_acd = p_acd; p_acd = FALSE; +# endif (void)win_split_ins(0, WSP_TOP, aucmd_win, 0); (void)win_comp_pos(); /* recompute window positions */ p_ea = save_ea; +# ifdef FEAT_AUTOCHDIR p_acd = save_acd; +# endif unblock_autocmds(); #endif curwin = aucmd_win; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 15, +/**/ 14, /**/ 13,