forked from aniani/vim
patch 8.2.3617: ":verbose pwd" does not mention 'autochdir' was applied
Problem: ":verbose pwd" does not mention 'autochdir' was applied. Solution: Remember the last chdir was done by 'autochdir'. (issue #9142)
This commit is contained in:
@@ -1899,7 +1899,10 @@ do_autochdir(void)
|
|||||||
if ((starting == 0 || test_autochdir)
|
if ((starting == 0 || test_autochdir)
|
||||||
&& curbuf->b_ffname != NULL
|
&& curbuf->b_ffname != NULL
|
||||||
&& vim_chdirfile(curbuf->b_ffname, "auto") == OK)
|
&& vim_chdirfile(curbuf->b_ffname, "auto") == OK)
|
||||||
|
{
|
||||||
shorten_fnames(TRUE);
|
shorten_fnames(TRUE);
|
||||||
|
last_chdir_reason = "autochdir";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -7390,6 +7390,7 @@ changedir_func(
|
|||||||
|
|
||||||
if (dir_differs)
|
if (dir_differs)
|
||||||
{
|
{
|
||||||
|
last_chdir_reason = NULL;
|
||||||
if (scope == CDSCOPE_WINDOW)
|
if (scope == CDSCOPE_WINDOW)
|
||||||
acmd_fname = (char_u *)"window";
|
acmd_fname = (char_u *)"window";
|
||||||
else if (scope == CDSCOPE_TABPAGE)
|
else if (scope == CDSCOPE_TABPAGE)
|
||||||
@@ -7453,7 +7454,9 @@ ex_pwd(exarg_T *eap UNUSED)
|
|||||||
{
|
{
|
||||||
char *context = "global";
|
char *context = "global";
|
||||||
|
|
||||||
if (curwin->w_localdir != NULL)
|
if (last_chdir_reason != NULL)
|
||||||
|
context = last_chdir_reason;
|
||||||
|
else if (curwin->w_localdir != NULL)
|
||||||
context = "window";
|
context = "window";
|
||||||
else if (curtab->tp_localdir != NULL)
|
else if (curtab->tp_localdir != NULL)
|
||||||
context = "tabpage";
|
context = "tabpage";
|
||||||
|
@@ -832,6 +832,7 @@ EXTERN int stdout_isatty INIT(= TRUE); // is stdout a terminal?
|
|||||||
#if defined(FEAT_AUTOCHDIR)
|
#if defined(FEAT_AUTOCHDIR)
|
||||||
EXTERN int test_autochdir INIT(= FALSE);
|
EXTERN int test_autochdir INIT(= FALSE);
|
||||||
#endif
|
#endif
|
||||||
|
EXTERN char *last_chdir_reason INIT(= NULL);
|
||||||
#if defined(EXITFREE)
|
#if defined(EXITFREE)
|
||||||
EXTERN int entered_free_all_mem INIT(= FALSE);
|
EXTERN int entered_free_all_mem INIT(= FALSE);
|
||||||
// TRUE when in or after free_all_mem()
|
// TRUE when in or after free_all_mem()
|
||||||
|
@@ -275,7 +275,8 @@ main
|
|||||||
* Hint: to avoid this when typing a command use a forward slash.
|
* Hint: to avoid this when typing a command use a forward slash.
|
||||||
* If the cd fails, it doesn't matter.
|
* If the cd fails, it doesn't matter.
|
||||||
*/
|
*/
|
||||||
(void)vim_chdirfile(params.fname, "drop");
|
if (vim_chdirfile(params.fname, "drop") == OK)
|
||||||
|
last_chdir_reason = "drop";
|
||||||
if (start_dir != NULL)
|
if (start_dir != NULL)
|
||||||
mch_dirname(start_dir, MAXPATHL);
|
mch_dirname(start_dir, MAXPATHL);
|
||||||
}
|
}
|
||||||
|
@@ -2656,7 +2656,10 @@ netbeans_file_opened(buf_T *bufp)
|
|||||||
|
|
||||||
nb_send(buffer, "netbeans_file_opened");
|
nb_send(buffer, "netbeans_file_opened");
|
||||||
if (p_acd && vim_chdirfile(bufp->b_ffname, "auto") == OK)
|
if (p_acd && vim_chdirfile(bufp->b_ffname, "auto") == OK)
|
||||||
|
{
|
||||||
|
last_chdir_reason = "netbeans";
|
||||||
shorten_fnames(TRUE);
|
shorten_fnames(TRUE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -7783,8 +7783,9 @@ fix_arg_enc(void)
|
|||||||
if (curwin->w_arg_idx == 0 && curbuf->b_fname == NULL)
|
if (curwin->w_arg_idx == 0 && curbuf->b_fname == NULL)
|
||||||
{
|
{
|
||||||
do_cmdline_cmd((char_u *)":rewind");
|
do_cmdline_cmd((char_u *)":rewind");
|
||||||
if (GARGCOUNT == 1 && used_file_full_path)
|
if (GARGCOUNT == 1 && used_file_full_path
|
||||||
(void)vim_chdirfile(alist_name(&GARGLIST[0]), "drop");
|
&& vim_chdirfile(alist_name(&GARGLIST[0]), "drop") == OK)
|
||||||
|
last_chdir_reason = "drop";
|
||||||
}
|
}
|
||||||
|
|
||||||
set_alist_count();
|
set_alist_count();
|
||||||
|
@@ -25,4 +25,33 @@ func Test_set_filename()
|
|||||||
call delete('samples/Xtest')
|
call delete('samples/Xtest')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_verbose_pwd()
|
||||||
|
let cwd = getcwd()
|
||||||
|
call test_autochdir()
|
||||||
|
|
||||||
|
edit global.txt
|
||||||
|
call assert_match('\[global\].*testdir$', execute('verbose pwd'))
|
||||||
|
|
||||||
|
call mkdir('Xautodir')
|
||||||
|
split Xautodir/local.txt
|
||||||
|
lcd Xautodir
|
||||||
|
call assert_match('\[window\].*testdir[/\\]Xautodir', execute('verbose pwd'))
|
||||||
|
|
||||||
|
set acd
|
||||||
|
wincmd w
|
||||||
|
call assert_match('\[autochdir\].*testdir$', execute('verbose pwd'))
|
||||||
|
wincmd w
|
||||||
|
call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
|
||||||
|
set noacd
|
||||||
|
call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
|
||||||
|
wincmd w
|
||||||
|
call assert_match('\[global\].*testdir', execute('verbose pwd'))
|
||||||
|
wincmd w
|
||||||
|
call assert_match('\[window\].*testdir[/\\]Xautodir', execute('verbose pwd'))
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
call chdir(cwd)
|
||||||
|
call delete('Xautodir', 'rf')
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -757,6 +757,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
3617,
|
||||||
/**/
|
/**/
|
||||||
3616,
|
3616,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -4873,7 +4873,10 @@ fix_current_dir(void)
|
|||||||
dirname = curtab->tp_localdir;
|
dirname = curtab->tp_localdir;
|
||||||
|
|
||||||
if (mch_chdir((char *)dirname) == 0)
|
if (mch_chdir((char *)dirname) == 0)
|
||||||
|
{
|
||||||
|
last_chdir_reason = NULL;
|
||||||
shorten_fnames(TRUE);
|
shorten_fnames(TRUE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (globaldir != NULL)
|
else if (globaldir != NULL)
|
||||||
{
|
{
|
||||||
@@ -4881,6 +4884,7 @@ fix_current_dir(void)
|
|||||||
// directory: Change to the global directory.
|
// directory: Change to the global directory.
|
||||||
vim_ignored = mch_chdir((char *)globaldir);
|
vim_ignored = mch_chdir((char *)globaldir);
|
||||||
VIM_CLEAR(globaldir);
|
VIM_CLEAR(globaldir);
|
||||||
|
last_chdir_reason = NULL;
|
||||||
shorten_fnames(TRUE);
|
shorten_fnames(TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user