vim-patch:8.2.3739: in wrong directory when using win_execute() with 'acd' set

Problem:    In wrong directory when using win_execute() with 'acd' set.
Solution:   Restore the directory when returning to the window. (closes vim/vim#9276)
dea4a61637

src/nvim/testdir/test_autochdir.vim

@@ -26,6 +26,34 @@ func Test_set_filename()
   call delete('samples/Xtest')
 endfunc
 
+func Test_set_filename_other_window()
+  CheckFunction test_autochdir
+  call ch_logfile('logfile', 'w')
+  let cwd = getcwd()
+  call test_autochdir()
+  call mkdir('Xa')
+  call mkdir('Xb')
+  call mkdir('Xc')
+  try
+    args Xa/aaa.txt Xb/bbb.txt
+    set acd
+    let winid = win_getid()
+    snext
+    call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+    call win_execute(winid, 'file ' .. cwd .. '/Xc/ccc.txt')
+    call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+  finally
+    set noacd
+    call chdir(cwd)
+    call delete('Xa', 'rf')
+    call delete('Xb', 'rf')
+    call delete('Xc', 'rf')
+    bwipe! aaa.txt
+    bwipe! bbb.txt
+    bwipe! ccc.txt
+  endtry
+endfunc
+
 func Test_verbose_pwd()
   CheckFunction test_autochdir
   let cwd = getcwd()
@@ -55,6 +83,8 @@ func Test_verbose_pwd()
   set noacd
   call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
   wincmd w
+  call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
+  execute 'cd' cwd
   call assert_match('\[global\].*testdir', execute('verbose pwd'))
   wincmd w
   call assert_match('\[window\].*testdir[/\\]Xautodir', execute('verbose pwd'))

src/nvim/window.c

@@ -4680,6 +4680,10 @@ static void win_enter_ext(win_T *const wp, const int flags)
 /// Used after making another window the current one: change directory if needed.
 void fix_current_dir(void)
 {
+  if (p_acd) {
+    do_autochdir();
+    return;
+  }
   // New directory is either the local directory of the window, tab or NULL.
   char *new_dir = (char *)(curwin->w_localdir
                            ? curwin->w_localdir : curtab->tp_localdir);

test/functional/legacy/autochdir_spec.lua

@@ -1,8 +1,12 @@
 local lfs = require('lfs')
 local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, matches = helpers.clear, helpers.eq, helpers.matches
-local eval, command, call = helpers.eval, helpers.command, helpers.call
-local exec_capture = helpers.exec_capture
+local eval, command, call, meths = helpers.eval, helpers.command, helpers.call, helpers.meths
+local source, exec_capture = helpers.source, helpers.exec_capture
+
+local function expected_empty()
+  eq({}, meths.get_vvar('errors'))
+end
 
 describe('autochdir behavior', function()
   local dir = 'Xtest_functional_legacy_autochdir'
@@ -25,6 +29,38 @@ describe('autochdir behavior', function()
     eq(dir, eval([[substitute(getcwd(), '.*[/\\]\(\k*\)', '\1', '')]]))
   end)
 
+  it(':file in win_execute() does not cause wrong directory', function()
+    command('cd '..dir)
+    source([[
+      func Test_set_filename_other_window()
+        let cwd = getcwd()
+        call mkdir('Xa')
+        call mkdir('Xb')
+        call mkdir('Xc')
+        try
+          args Xa/aaa.txt Xb/bbb.txt
+          set acd
+          let winid = win_getid()
+          snext
+          call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+          call win_execute(winid, 'file ' .. cwd .. '/Xc/ccc.txt')
+          call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+        finally
+          set noacd
+          call chdir(cwd)
+          call delete('Xa', 'rf')
+          call delete('Xb', 'rf')
+          call delete('Xc', 'rf')
+          bwipe! aaa.txt
+          bwipe! bbb.txt
+          bwipe! ccc.txt
+        endtry
+      endfunc
+    ]])
+    call('Test_set_filename_other_window')
+    expected_empty()
+  end)
+
   it(':verbose pwd shows whether autochdir is used', function()
     local subdir = 'Xautodir'
     command('cd '..dir)
@@ -51,6 +87,8 @@ describe('autochdir behavior', function()
     command('set noautochdir')
     matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
     command('wincmd w')
+    matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('cd '..cwd)
     matches('%[global%].*'..dir, exec_capture('verbose pwd'))
     command('wincmd w')
     matches('%[window%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))