From fa9dd9abf3123e9b56c0ec806fee39c0181decda Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 4 Nov 2020 01:46:22 -0500 Subject: vim-patch:8.1.1956: screenshot tests may use a different encoding Problem: Screenshot tests may use a different encoding. (Dominique Pelle) Solution: Always set 'encoding' to "utf-8" when running Vim in a terminal. (closes vim/vim#4884) https://github.com/vim/vim/commit/0fdddeeb66bbe326860ddfc573eba42f6487bbda Comment out the encoding change in shared.vim because Neovim always uses utf-8 for internal character encoding. --- src/nvim/testdir/shared.vim | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') 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 -- cgit