aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_docmd.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-11-21 17:47:09 -0500
committerGitHub <noreply@github.com>2021-11-21 17:47:09 -0500
commit0d967f0298a355452f62b9c76c34e102a6b9016e (patch)
tree467949d95f8bb1791a31c7439846bf6d2755d3e1 /src/nvim/ex_docmd.c
parentd99d4af7b129032865cb5a4fd8e6999e73460fb0 (diff)
parent349b9ce9df0c7f48ce236216ab0d2c507f483425 (diff)
downloadrneovim-0d967f0298a355452f62b9c76c34e102a6b9016e.tar.gz
rneovim-0d967f0298a355452f62b9c76c34e102a6b9016e.tar.bz2
rneovim-0d967f0298a355452f62b9c76c34e102a6b9016e.zip
Merge pull request #16362 from zeertzjq/vim-8.2.3617
vim-patch:8.2.{3468,3617,3618,3622}: some other CWD related patches
Diffstat (limited to 'src/nvim/ex_docmd.c')
-rw-r--r--src/nvim/ex_docmd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 34c3b3889e..62919c98f7 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -7753,6 +7753,7 @@ void post_chdir(CdScope scope, bool trigger_dirchanged)
abort();
}
+ last_chdir_reason = NULL;
shorten_fnames(true);
if (trigger_dirchanged) {
@@ -7870,7 +7871,9 @@ static void ex_pwd(exarg_T *eap)
#endif
if (p_verbose > 0) {
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";