Merge pull request #25346 from zeertzjq/vim-9.0.1931

vim-patch:9.0.{1931,1934}

3 files changed, 20 insertions, 10 deletions

diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim
index 9da20e662e..453ac10c00 100644
--- a/test/old/testdir/test_autocmd.vim
+++ b/test/old/testdir/test_autocmd.vim
@@ -3442,11 +3442,22 @@ func Test_closing_autocmd_window()
   END
   call CheckScriptFailure(lines, 'E814:')
   au! BufEnter
-  only!
   bwipe Xa.txt
   bwipe Xb.txt
 endfunc
 
+func Test_switch_window_in_autocmd_window()
+  edit Xa.txt
+  tabnew Xb.txt
+  autocmd BufEnter Xa.txt wincmd w
+  doautoall BufEnter
+  au! BufEnter
+  bwipe Xa.txt
+  call assert_false(bufexists('Xa.txt'))
+  bwipe Xb.txt
+  call assert_false(bufexists('Xb.txt'))
+endfunc
+
 func Test_bufwipeout_changes_window()
   " This should not crash, but we don't have any expectations about what
   " happens, changing window in BufWipeout has unpredictable results.
diff --git a/test/old/testdir/test_compiler.vim b/test/old/testdir/test_compiler.vim
index ec7d143030..0b22bafabb 100644
--- a/test/old/testdir/test_compiler.vim
+++ b/test/old/testdir/test_compiler.vim
@@ -7,10 +7,8 @@ func Test_compiler()
   CheckExecutable perl
   CheckFeature quickfix
 
-  " $LANG changes the output of Perl.
-  if $LANG != ''
-    unlet $LANG
-  endif
+  let save_LC_ALL = $LC_ALL
+  let $LC_ALL= "C"
 
   " %:S does not work properly with 'shellslash' set
   let save_shellslash = &shellslash
@@ -40,12 +38,13 @@ func Test_compiler()
   let &shellslash = save_shellslash
   call delete('Xfoo.pl')
   bw!
+  let $LC_ALL = save_LC_ALL
 endfunc
 
 func GetCompilerNames()
   return glob('$VIMRUNTIME/compiler/*.vim', 0, 1)
-       \ ->map({i, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).vim', '\1', '')})
-       \ ->sort()
+        \ ->map({i, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).vim', '\1', '')})
+        \ ->sort()
 endfunc
 
 func Test_compiler_without_arg()
diff --git a/test/old/testdir/test_syntax.vim b/test/old/testdir/test_syntax.vim
index c9ad4bb857..76a21adc57 100644
--- a/test/old/testdir/test_syntax.vim
+++ b/test/old/testdir/test_syntax.vim
@@ -41,9 +41,9 @@ func AssertHighlightGroups(lnum, startcol, expected, trans = 1, msg = "")
 
   for l:i in range(a:startcol, a:startcol + l:expectedGroups->len() - 1)
     let l:errors += synID(a:lnum, l:i, a:trans)
-         \ ->synIDattr("name")
-         \ ->assert_equal(l:expectedGroups[l:i - 1],
-         \    l:msg .. l:i)
+          \ ->synIDattr("name")
+          \ ->assert_equal(l:expectedGroups[l:i - 1],
+          \    l:msg .. l:i)
   endfor
 endfunc