diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-03-06 08:11:52 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-03-07 06:43:03 +0800 |
| commit | da9bc96152efedfa80fabf0d1aabe52b7269181e (patch) | |
| tree | b4bfaf0636451f8278fecb0a9c0822cad2ec583a /src/nvim/window.h | |
| parent | 1a5409db0d21c2cf4fe59c825ed73d8a64f62693 (diff) | |
| download | rneovim-da9bc96152efedfa80fabf0d1aabe52b7269181e.tar.gz rneovim-da9bc96152efedfa80fabf0d1aabe52b7269181e.tar.bz2 rneovim-da9bc96152efedfa80fabf0d1aabe52b7269181e.zip | |
vim-patch:8.2.3920: restoring directory after using another window is inefficient
Problem: Restoring directory after using another window is inefficient.
Solution: Only restore the directory for win_execute(). Apply 'autochdir'
only when needed.
https://github.com/vim/vim/commit/90c317f2246a7fb4bd4e3feb0778b53627bc9fad
Diffstat (limited to 'src/nvim/window.h')
| -rw-r--r-- | src/nvim/window.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/nvim/window.h b/src/nvim/window.h index e2fd2c515d..c9af88b9ad 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,27 @@ 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; \ + const int 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; \ |