mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 11:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

options: properly reset directories on 'autochdir' (#9894)

Browse Source 
Fixes https://github.com/neovim/neovim/issues/9892
This commit is contained in:
Marco Hinz
2019-04-13 12:50:36 +02:00
committed by GitHub
parent d08692a824
commit 5f996e36d1
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/vim.c
View File

@@ -690,7 +690,7 @@ void nvim_set_current_dir(String dir, Error *err)
return;
}
post_chdir(kCdScopeGlobal);
post_chdir(kCdScopeGlobal, true);
try_end(err);
}

1
src/nvim/buffer.c
View File

@@ -1620,6 +1620,7 @@ void do_autochdir(void)
if (starting == 0
&& curbuf->b_ffname != NULL
&& vim_chdirfile(curbuf->b_ffname) == OK) {
post_chdir(kCdScopeGlobal, false);
shorten_fnames(true);
}
}

9
src/nvim/ex_docmd.c
View File

@@ -7241,7 +7241,7 @@ void free_cd_dir(void)
/// Deal with the side effects of changing the current directory.
///
/// @param scope Scope of the function call (global, tab or window).
void post_chdir(CdScope scope)
void post_chdir(CdScope scope, bool trigger_dirchanged)
{
// Always overwrite the window-local CWD.
xfree(curwin->w_localdir);
@@ -7281,7 +7281,10 @@ void post_chdir(CdScope scope)
}
shorten_fnames(true);
do_autocmd_dirchanged(cwd, scope);
if (trigger_dirchanged) {
do_autocmd_dirchanged(cwd, scope);
}
}
/// `:cd`, `:tcd`, `:lcd`, `:chdir`, `:tchdir` and `:lchdir`.
@@ -7343,7 +7346,7 @@ void ex_cd(exarg_T *eap)
if (vim_chdir(new_dir, scope)) {
EMSG(_(e_failed));
} else {
post_chdir(scope);
post_chdir(scope, true);
// Echo the new current directory if the command was typed.
if (KeyTyped || p_verbose >= 5) {
ex_pwd(eap);