aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-03-06 09:03:26 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-03-07 06:43:03 +0800
commit8e06377bc6b3cdbabd0fd50e5ee351067fc5ec42 (patch)
tree9bd8e347f368f3ae2c35b412c462548febbbdb80
parentda9bc96152efedfa80fabf0d1aabe52b7269181e (diff)
downloadrneovim-8e06377bc6b3cdbabd0fd50e5ee351067fc5ec42.tar.gz
rneovim-8e06377bc6b3cdbabd0fd50e5ee351067fc5ec42.tar.bz2
rneovim-8e06377bc6b3cdbabd0fd50e5ee351067fc5ec42.zip
vim-patch:8.2.4060: win_execute() slow on systems where getcwd()/chdir() is slow
Problem: win_execute() is slow on systems where getcwd() or chdir() is slow. (Rick Howe) Solution: Avoid using getcwd() and chdir() if no local directory is used and 'acd' is not set. (closes vim/vim#9504) https://github.com/vim/vim/commit/d6f27c66cca32b93fcf8024b1bad1618946bbbea
-rw-r--r--src/nvim/window.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/nvim/window.h b/src/nvim/window.h
index c9af88b9ad..42701f72b4 100644
--- a/src/nvim/window.h
+++ b/src/nvim/window.h
@@ -51,7 +51,16 @@ typedef struct {
char_u cwd_[MAXPATHL]; \
char_u autocwd_[MAXPATHL]; \
bool apply_acd_ = false; \
- const int cwd_status_ = os_dirname(cwd_, MAXPATHL); \
+ 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) { \