patch 8.2.3926: build failure without the 'autochdir' option

Problem:    Build failure without the 'autochdir' option. (John Marriott)
Solution:   Add #ifdefs.

diff --git a/src/evalwindow.c b/src/evalwindow.c
index ebab856142435248faf1631b5c24a1f942d4cd74..4ac60265ccea25d0dcad498919c457f601c5e247 100644 (file)
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -709,11 +709,14 @@ f_win_execute(typval_T *argvars, typval_T *rettv)
        pos_T   curpos = wp->w_cursor;
        char_u  cwd[MAXPATHL];
        int     cwd_status;
+#ifdef FEAT_AUTOCHDIR
        char_u  autocwd[MAXPATHL];
        int     apply_acd = FALSE;
+#endif
 
        cwd_status = mch_dirname(cwd, MAXPATHL);
 
+#ifdef FEAT_AUTOCHDIR
        // If 'acd' is set, check we are using that directory.  If yes, then
        // apply 'acd' afterwards, otherwise restore the current directory.
        if (cwd_status == OK && p_acd)
@@ -722,6 +725,7 @@ f_win_execute(typval_T *argvars, typval_T *rettv)
            apply_acd = mch_dirname(autocwd, MAXPATHL) == OK
                                                  && STRCMP(cwd, autocwd) == 0;
        }
+#endif
 
        if (switch_win_noblock(&save_curwin, &save_curtab, wp, tp, TRUE) == OK)
        {
@@ -729,9 +733,12 @@ f_win_execute(typval_T *argvars, typval_T *rettv)
            execute_common(argvars, rettv, 1);
        }
        restore_win_noblock(save_curwin, save_curtab, TRUE);
+#ifdef FEAT_AUTOCHDIR
        if (apply_acd)
            do_autochdir();
-       else if (cwd_status == OK)
+       else
+#endif
+           if (cwd_status == OK)
            mch_chdir((char *)cwd);
 
        // Update the status line if the cursor moved.

diff --git a/src/version.c b/src/version.c
index 60b1e5c924f581b403c01bad07de8f21ae923b0b..e091971833209faa87518c9fd3089257a06fd784 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3926,
 /**/
     3925,
 /**/