aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-11-04 08:15:16 -0500
committerGitHub <noreply@github.com>2020-11-04 08:15:16 -0500
commitee3acef3864b843d242ed617d4e3c7550b858b0d (patch)
treefe184ffa0983228ef8057fad8fe121ac13663127 /src
parent8a3a9ffa3d57a5a4c52df13fd1c1f71b7f801196 (diff)
parentfa9dd9abf3123e9b56c0ec806fee39c0181decda (diff)
downloadrneovim-ee3acef3864b843d242ed617d4e3c7550b858b0d.tar.gz
rneovim-ee3acef3864b843d242ed617d4e3c7550b858b0d.tar.bz2
rneovim-ee3acef3864b843d242ed617d4e3c7550b858b0d.zip
Merge pull request #13224 from janlazo/vim-8.2.1944
vim-patch:8.1.{1829,1956,2234},8.2.1944
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/shared.vim3
-rw-r--r--src/nvim/testdir/test_windows_home.vim5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
index 4f1ddcd7b9..440da67412 100644
--- a/src/nvim/testdir/shared.vim
+++ b/src/nvim/testdir/shared.vim
@@ -291,6 +291,9 @@ func GetVimCommandClean()
let cmd = substitute(cmd, '-u NONE', '--clean', '')
let cmd = substitute(cmd, '--headless', '', '')
+ " Force using utf-8, Vim may pick up something else from the environment.
+ " let cmd ..= ' --cmd "set enc=utf8" '
+
" Optionally run Vim under valgrind
" let cmd = 'valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind ' . cmd
diff --git a/src/nvim/testdir/test_windows_home.vim b/src/nvim/testdir/test_windows_home.vim
index 2e311b9aa5..3c2db01444 100644
--- a/src/nvim/testdir/test_windows_home.vim
+++ b/src/nvim/testdir/test_windows_home.vim
@@ -1,8 +1,7 @@
" Test for $HOME on Windows.
-if !has('win32')
- finish
-endif
+source check.vim
+CheckMSWindows
let s:env = {}