mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3920: restoring directory after using another window is inefficient

Browse Source 
Problem:    Restoring directory after using another window is inefficient.
Solution:   Only restore the directory for win_execute().  Apply 'autochdir'
            only when needed.
90c317f224
This commit is contained in:
zeertzjq
2022-03-06 08:11:52 +08:00
parent 1a5409db0d
commit da9bc96152
4 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/window.h
View File

@@ -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; \