mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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)
|
||||
&& curbuf->b_ffname != NULL
|
||||
&& vim_chdirfile(curbuf->b_ffname, "auto") == OK)
|
||||
{
|
||||
shorten_fnames(TRUE);
|
||||
last_chdir_reason = "autochdir";
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@@ -7390,6 +7390,7 @@ changedir_func(
|
||||
|
||||
if (dir_differs)
|
||||
{
|
||||
last_chdir_reason = NULL;
|
||||
if (scope == CDSCOPE_WINDOW)
|
||||
acmd_fname = (char_u *)"window";
|
||||
else if (scope == CDSCOPE_TABPAGE)
|
||||
@@ -7453,7 +7454,9 @@ ex_pwd(exarg_T *eap UNUSED)
|
||||
{
|
||||
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";
|
||||
else if (curtab->tp_localdir != NULL)
|
||||
context = "tabpage";
|
||||
|
@@ -832,6 +832,7 @@ EXTERN int stdout_isatty INIT(= TRUE); // is stdout a terminal?
|
||||
#if defined(FEAT_AUTOCHDIR)
|
||||
EXTERN int test_autochdir INIT(= FALSE);
|
||||
#endif
|
||||
EXTERN char *last_chdir_reason INIT(= NULL);
|
||||
#if defined(EXITFREE)
|
||||
EXTERN int entered_free_all_mem INIT(= FALSE);
|
||||
// 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.
|
||||
* 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)
|
||||
mch_dirname(start_dir, MAXPATHL);
|
||||
}
|
||||
|
@@ -2656,8 +2656,11 @@ netbeans_file_opened(buf_T *bufp)
|
||||
|
||||
nb_send(buffer, "netbeans_file_opened");
|
||||
if (p_acd && vim_chdirfile(bufp->b_ffname, "auto") == OK)
|
||||
{
|
||||
last_chdir_reason = "netbeans";
|
||||
shorten_fnames(TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Tell netbeans that a file was deleted or wiped out.
|
||||
|
@@ -7783,8 +7783,9 @@ fix_arg_enc(void)
|
||||
if (curwin->w_arg_idx == 0 && curbuf->b_fname == NULL)
|
||||
{
|
||||
do_cmdline_cmd((char_u *)":rewind");
|
||||
if (GARGCOUNT == 1 && used_file_full_path)
|
||||
(void)vim_chdirfile(alist_name(&GARGLIST[0]), "drop");
|
||||
if (GARGCOUNT == 1 && used_file_full_path
|
||||
&& vim_chdirfile(alist_name(&GARGLIST[0]), "drop") == OK)
|
||||
last_chdir_reason = "drop";
|
||||
}
|
||||
|
||||
set_alist_count();
|
||||
|
@@ -25,4 +25,33 @@ func Test_set_filename()
|
||||
call delete('samples/Xtest')
|
||||
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
|
||||
|
@@ -757,6 +757,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3617,
|
||||
/**/
|
||||
3616,
|
||||
/**/
|
||||
|
@@ -4873,14 +4873,18 @@ fix_current_dir(void)
|
||||
dirname = curtab->tp_localdir;
|
||||
|
||||
if (mch_chdir((char *)dirname) == 0)
|
||||
{
|
||||
last_chdir_reason = NULL;
|
||||
shorten_fnames(TRUE);
|
||||
}
|
||||
}
|
||||
else if (globaldir != NULL)
|
||||
{
|
||||
// Window doesn't have a local directory and we are not in the global
|
||||
// directory: Change to the global directory.
|
||||
vim_ignored = mch_chdir((char *)globaldir);
|
||||
VIM_CLEAR(globaldir);
|
||||
last_chdir_reason = NULL;
|
||||
shorten_fnames(TRUE);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user