adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0272: autocmd may change cwd after :tcd and :lcd

Browse Source 
Problem:  Autocommand may change currect directory after :tcd and :lcd.
Solution: Also clear tp_localdir and w_localdir when using aucmd_win.
          (zeertzjq)

closes: #14435

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-04-07 18:16:10 +02:00
committed by Christian Brabandt
parent a44ced5763
commit 9d956ee8ea
6 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/autocmd.c
View File

@ -1660,6 +1660,11 @@ aucmd_prepbuf(
win_init_popup_win(auc_win, buf);
// Make sure tp_localdir and globaldir are NULL to avoid a
// chdir() in win_enter_ext().
// win_init_popup_win() has already set w_localdir to NULL.
aco->tp_localdir = curtab->tp_localdir;
curtab->tp_localdir = NULL;
aco->globaldir = globaldir;
globaldir = NULL;
@ -1773,6 +1778,12 @@ win_found:
vars_clear(&awp->w_vars->dv_hashtab); // free all w: variables
hash_init(&awp->w_vars->dv_hashtab); // re-use the hashtab
#endif
// If :lcd has been used in the autocommand window, correct current
// directory before restoring tp_localdir and globaldir.
if (awp->w_localdir != NULL)
win_fix_current_dir();
vim_free(curtab->tp_localdir);
curtab->tp_localdir = aco->tp_localdir;
vim_free(globaldir);
globaldir = aco->globaldir;