thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3926: build failure without the 'autochdir' option

Browse Source 
Problem:    Build failure without the 'autochdir' option. (John Marriott)
Solution:   Add #ifdefs.
This commit is contained in:
Bram Moolenaar
2021-12-28 20:03:43 +00:00
parent 06f6095623
commit 92f246e4f9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/evalwindow.c
View File

@@ -709,11 +709,14 @@ f_win_execute(typval_T *argvars, typval_T *rettv)
pos_T curpos = wp->w_cursor; pos_T curpos = wp->w_cursor;
char_u cwd[MAXPATHL]; char_u cwd[MAXPATHL];
int cwd_status; int cwd_status;
#ifdef FEAT_AUTOCHDIR
char_u autocwd[MAXPATHL]; char_u autocwd[MAXPATHL];
int apply_acd = FALSE; int apply_acd = FALSE;
#endif
cwd_status = mch_dirname(cwd, MAXPATHL); cwd_status = mch_dirname(cwd, MAXPATHL);
#ifdef FEAT_AUTOCHDIR
// If 'acd' is set, check we are using that directory. If yes, then // If 'acd' is set, check we are using that directory. If yes, then
// apply 'acd' afterwards, otherwise restore the current directory. // apply 'acd' afterwards, otherwise restore the current directory.
if (cwd_status == OK && p_acd) 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 apply_acd = mch_dirname(autocwd, MAXPATHL) == OK
&& STRCMP(cwd, autocwd) == 0; && STRCMP(cwd, autocwd) == 0;
} }
#endif
if (switch_win_noblock(&save_curwin, &save_curtab, wp, tp, TRUE) == OK) 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); execute_common(argvars, rettv, 1);
} }
restore_win_noblock(save_curwin, save_curtab, TRUE); restore_win_noblock(save_curwin, save_curtab, TRUE);
#ifdef FEAT_AUTOCHDIR
if (apply_acd) if (apply_acd)
do_autochdir(); do_autochdir();
else if (cwd_status == OK) else
#endif
if (cwd_status == OK)
mch_chdir((char *)cwd); mch_chdir((char *)cwd);
// Update the status line if the cursor moved. // Update the status line if the cursor moved.

2
src/version.c
View File

@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3926,
/**/ /**/
3925, 3925,
/**/ /**/