diff options
| -rw-r--r-- | src/nvim/testdir/test_autochdir.vim | 21 | ||||
| -rw-r--r-- | src/nvim/window.c | 3 | ||||
| -rw-r--r-- | src/nvim/window.h | 16 | ||||
| -rw-r--r-- | test/functional/legacy/autochdir_spec.lua | 14 |
4 files changed, 51 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_autochdir.vim b/src/nvim/testdir/test_autochdir.vim index 8f61224a13..de5c124908 100644 --- a/src/nvim/testdir/test_autochdir.vim +++ b/src/nvim/testdir/test_autochdir.vim @@ -53,6 +53,27 @@ func Test_set_filename_other_window() endtry endfunc +func Test_acd_win_execute() + CheckFunction test_autochdir + let cwd = getcwd() + set acd + call test_autochdir() + + call mkdir('Xfile') + let winid = win_getid() + new Xfile/file + call assert_match('testdir.Xfile$', getcwd()) + cd .. + call assert_match('testdir$', getcwd()) + call win_execute(winid, 'echo') + call assert_match('testdir$', getcwd()) + + bwipe! + set noacd + call chdir(cwd) + call delete('Xfile', 'rf') +endfunc + func Test_verbose_pwd() CheckFunction test_autochdir let cwd = getcwd() diff --git a/src/nvim/window.c b/src/nvim/window.c index c4002e93e0..f04204fafe 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -6767,9 +6767,6 @@ void restore_win_noblock(switchwin_T *switchwin, bool no_display) curwin = switchwin->sw_curwin; curbuf = curwin->w_buffer; } - // If called by win_execute() and executing the command changed the - // directory, it now has to be restored. - fix_current_dir(); } /// Make "buf" the current buffer. 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; \ diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua index 75df1f8c55..89651284b5 100644 --- a/test/functional/legacy/autochdir_spec.lua +++ b/test/functional/legacy/autochdir_spec.lua @@ -61,6 +61,20 @@ describe('autochdir behavior', function() expected_empty() end) + it('win_execute() does not change directory', function() + local subdir = 'Xfile' + command('cd '..dir) + command('set autochdir') + call('mkdir', subdir) + local winid = eval('win_getid()') + command('new '..subdir..'/file') + matches('.*'..dir..'[/\\]'..subdir, eval('getcwd()')) + command('cd ..') + matches('.*'..dir, eval('getcwd()')) + call('win_execute', winid, 'echo') + matches('.*'..dir, eval('getcwd()')) + end) + it(':verbose pwd shows whether autochdir is used', function() local subdir = 'Xautodir' command('cd '..dir) |