mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 06:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

DirChanged: avoid redundant events on 'autochdir'

Browse Source
This commit is contained in:
Justin M. Keyes
2017-03-12 12:12:26 +01:00
parent d9fcbc2cfb
commit c5e61b41a5
3 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/ex_docmd.c
View File

@@ -6960,8 +6960,8 @@ void post_chdir(CdScope scope)
}
}
char curdir[MAXPATHL];
if (os_dirname((char_u *)curdir, MAXPATHL) != OK) {
char cwd[MAXPATHL];
if (os_dirname((char_u *)cwd, MAXPATHL) != OK) {
return;
}
switch (scope) {
@@ -6971,17 +6971,17 @@ void post_chdir(CdScope scope)
globaldir = NULL;
break;
case kCdScopeTab:
curtab->tp_localdir = (char_u *)xstrdup(curdir);
curtab->tp_localdir = (char_u *)xstrdup(cwd);
break;
case kCdScopeWindow:
curwin->w_localdir = (char_u *)xstrdup(curdir);
curwin->w_localdir = (char_u *)xstrdup(cwd);
break;
case kCdScopeInvalid:
assert(false);
}
shorten_fnames(true);
do_autocmd_dirchanged(curdir, scope);
do_autocmd_dirchanged(cwd, scope);
}
/// `:cd`, `:tcd`, `:lcd`, `:chdir`, `:tchdir` and `:lchdir`.

19
src/nvim/file_search.c
View File

@@ -1566,14 +1566,25 @@ void do_autocmd_dirchanged(char *new_dir, CdScope scope)
/// @return OK or FAIL
int vim_chdirfile(char_u *fname)
{
char_u dir[MAXPATHL];
char dir[MAXPATHL];
STRLCPY(dir, fname, MAXPATHL);
*path_tail_with_sep(dir) = NUL;
if (os_chdir((char *)dir) != 0) {
*path_tail_with_sep((char_u *)dir) = NUL;
if (os_dirname(NameBuff, sizeof(NameBuff)) != OK) {
NameBuff[0] = NUL;
}
if (os_chdir(dir) != 0) {
return FAIL;
}
do_autocmd_dirchanged((char *)dir, kCdScopeWindow);
#ifdef BACKSLASH_IN_FILENAME
slash_adjust(dir);
#endif
if (!strequal(dir, (char *)NameBuff)) {
do_autocmd_dirchanged(dir, kCdScopeWindow);
}
return OK;
}