Mercurial > vim
changeset 26796:63be149f733c v8.2.3926
patch 8.2.3926: build failure without the 'autochdir' option
Commit: https://github.com/vim/vim/commit/92f246e4f9936f15471d5ee71b9afd5f3e6e0653
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 28 20:03:43 2021 +0000
patch 8.2.3926: build failure without the 'autochdir' option
Problem: Build failure without the 'autochdir' option. (John Marriott)
Solution: Add #ifdefs.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 28 Dec 2021 21:15:03 +0100 |
parents | c64f6f1f1fae |
children | 616988edff61 |
files | src/evalwindow.c src/version.c |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -709,11 +709,14 @@ f_win_execute(typval_T *argvars, typval_ 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_ 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_ 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.