]> granicus.if.org Git - vim/commitdiff
updated for version 7.4b.015 v7.4b.015
authorBram Moolenaar <Bram@vim.org>
Mon, 5 Aug 2013 20:02:20 +0000 (22:02 +0200)
committerBram Moolenaar <Bram@vim.org>
Mon, 5 Aug 2013 20:02:20 +0000 (22:02 +0200)
Problem:    Can't compile without the 'acd' feature.
Solution:   Add #ifdefs. (Kazunobu Kuriyama)

src/fileio.c
src/version.c

index 20f082b22452a7723a61bf7f979df0961ad0cd4e..b48a83a3cdce30c44c3bdb741fbbe922ef28ff6b 100644 (file)
@@ -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;
index ca859f7e06a55ac813ea6a305846a3c61b6b770c..607ba9aae9aef1a1266206d36d6d8c70a28e130b 100644 (file)
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    15,
 /**/
     14,
 /**/