diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-03-07 07:10:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 07:10:48 +0800 |
| commit | 40e3668e54ac6989ec2cd5454f1b245dfd2514ba (patch) | |
| tree | bc67d0755ec11c11ab5e0a6b1ca1cd3e1ad4ef5a /src/nvim/window.h | |
| parent | 8e7446b3cbc5c82706f41d701239fa18ab5b2808 (diff) | |
| parent | 194411d18aced7b42b40e9a825eaf28c580246a5 (diff) | |
| download | rneovim-40e3668e54ac6989ec2cd5454f1b245dfd2514ba.tar.gz rneovim-40e3668e54ac6989ec2cd5454f1b245dfd2514ba.tar.bz2 rneovim-40e3668e54ac6989ec2cd5454f1b245dfd2514ba.zip | |
Merge pull request #17616 from zeertzjq/vim-8.2.3739
vim-patch:8.2.{3739,3745,3920,4060,4513}
Diffstat (limited to 'src/nvim/window.h')
| -rw-r--r-- | src/nvim/window.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/nvim/window.h b/src/nvim/window.h index e2fd2c515d..42701f72b4 100644 --- a/src/nvim/window.h +++ b/src/nvim/window.h @@ -5,6 +5,7 @@ #include "nvim/buffer_defs.h" #include "nvim/mark.h" +#include "nvim/os/os.h" // Values for file_name_in_line() #define FNAME_MESS 1 // give error message @@ -47,12 +48,36 @@ typedef struct { do { \ win_T *const wp_ = (wp); \ const pos_T curpos_ = wp_->w_cursor; \ + char_u cwd_[MAXPATHL]; \ + char_u autocwd_[MAXPATHL]; \ + bool apply_acd_ = false; \ + int cwd_status_ = FAIL; \ + /* Getting and setting directory can be slow on some systems, only do */ \ + /* this when the current or target window/tab have a local directory or */ \ + /* 'acd' is set. */ \ + if (curwin != wp \ + && (curwin->w_localdir != NULL || wp->w_localdir != NULL \ + || (curtab != tp && (curtab->tp_localdir != NULL || tp->tp_localdir != NULL)) \ + || p_acd)) { \ + cwd_status_ = os_dirname(cwd_, MAXPATHL); \ + } \ + /* If 'acd' is set, check we are using that directory. If yes, then */ \ + /* apply 'acd' afterwards, otherwise restore the current directory. */ \ + if (cwd_status_ == OK && p_acd) { \ + do_autochdir(); \ + apply_acd_ = os_dirname(autocwd_, MAXPATHL) == OK && STRCMP(cwd_, autocwd_) == 0; \ + } \ switchwin_T switchwin_; \ if (switch_win_noblock(&switchwin_, wp_, (tp), true) == OK) { \ check_cursor(); \ block; \ } \ restore_win_noblock(&switchwin_, true); \ + if (apply_acd_) { \ + do_autochdir(); \ + } else if (cwd_status_ == OK) { \ + os_chdir((char *)cwd_); \ + } \ /* Update the status line if the cursor moved. */ \ if (win_valid(wp_) && !equalpos(curpos_, wp_->w_cursor)) { \ wp_->w_redr_status = true; \ |