commit 0fdddeeb66bbe326860ddfc573eba42f6487bbda
author Bram Moolenaar <Bram@vim.org> Sun Sep 01 15:26:23 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Sep 01 15:26:23 2019 +0200
tree 60edbb51f671f6e6931bfbab49163f10f51c4fd5
parent 1bc353b6f1b063e189e0cef26f8dc586dcf9161f

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 #4884)

src/testdir/dumps/Test_popupwin_behind.dump

diff --git a/src/testdir/dumps/Test_popupwin_behind.dump b/src/testdir/dumps/Test_popupwin_behind.dump
index 1fa8615..cec0a52 100644
--- a/src/testdir/dumps/Test_popupwin_behind.dump
+++ b/src/testdir/dumps/Test_popupwin_behind.dump
@@ -7,4 +7,4 @@
 |~+0#4040ff13&| @34|l+0#0000001#ffd7ff255|i|n|e|4| +0#4040ff13#ffffff0@33
 |~| @73
 |[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
-|A+0&&|l|r|e|a|d|y| |o|n|l|y| |o|n|e| |w|i|n|d|o|w| @51
+| +0&&@74

src/testdir/shared.vim

diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 1032b45..cf15a4c 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -278,6 +278,9 @@
   let cmd = substitute(cmd, '-u NONE', '--clean', '')
   let cmd = substitute(cmd, '--not-a-term', '', '')
 
+  " 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
 

src/testdir/test_popupwin.vim

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 16e4519..a6d4d62 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1378,7 +1378,6 @@
   " |                             |
   " +-----------------------------+
   let lines =<< trim END
-    only 
     split
     vsplit
     let info_window1 = getwininfo()[0]
@@ -1649,11 +1648,12 @@
   CheckFeature timers
   CheckScreendump
 
-  call writefile([
-	\ "call setline(1, range(1, 20))",
-	\ "hi Notification ctermbg=lightblue",
-	\ "call popup_notification('first notification', {})",
-	\], 'XtestNotifications')
+  let lines =<< trim END
+	call setline(1, range(1, 20))
+	hi Notification ctermbg=lightblue
+	call popup_notification('first notification', {})
+  END
+  call writefile(lines, 'XtestNotifications')
   let buf = RunVimInTerminal('-S XtestNotifications', #{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_notify_01', {})
 

src/version.c

diff --git a/src/version.c b/src/version.c
index afde7b6..5c29e3c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1956,
+/**/
     1955,
 /**/
     1954,