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

patch 8.1.0602: DirChanged is also triggered when directory didn't change

Browse Source 
Problem:    DirChanged is also triggered when the directory didn't change.
            (Daniel Hahler)
Solution:   Compare the current with the new directory. (closes #3697)
This commit is contained in:
Bram Moolenaar
2018-12-16 15:38:02 +01:00
parent 4efe73b478
commit 2caad3fbbd
5 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ex_docmd.c
View File

@@ -9126,8 +9126,9 @@ post_chdir(int local)
void
ex_cd(exarg_T *eap)
{
char_u *new_dir;
char_u *tofree;
char_u *new_dir;
char_u *tofree;
int dir_differs;
new_dir = eap->arg;
#if !defined(UNIX) && !defined(VMS)
@@ -9183,7 +9184,9 @@ ex_cd(exarg_T *eap)
new_dir = NameBuff;
}
#endif
if (new_dir == NULL || vim_chdir(new_dir))
dir_differs = new_dir == NULL || prev_dir == NULL
|| STRCMP(prev_dir, new_dir) != 0;
if (new_dir == NULL || (dir_differs && vim_chdir(new_dir)))
EMSG(_(e_failed));
else
{
@@ -9195,9 +9198,11 @@ ex_cd(exarg_T *eap)
/* Echo the new current directory if the command was typed. */
if (KeyTyped || p_verbose >= 5)
ex_pwd(eap);
apply_autocmds(EVENT_DIRCHANGED,
is_local_chdir ? (char_u *)"window" : (char_u *)"global",
new_dir, FALSE, curbuf);
if (dir_differs)
apply_autocmds(EVENT_DIRCHANGED,
is_local_chdir ? (char_u *)"window" : (char_u *)"global",
new_dir, FALSE, curbuf);
}
vim_free(tofree);
}