From 39de6413c8b7bae882bed3dba636f6d52d793087 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 8 Aug 2019 21:52:39 +0200 Subject: [PATCH] patch 8.1.1829: difference in screenshots Problem: Difference in screenshots. Solution: Update screenshots. Change checks in a few more tests. (closes #4789) --- src/testdir/dumps/Test_popupwin_previewpopup_1.dump | 2 +- src/testdir/dumps/Test_popupwin_previewpopup_2.dump | 2 +- src/testdir/dumps/Test_popupwin_previewpopup_3.dump | 2 +- src/testdir/dumps/Test_popupwin_previewpopup_4.dump | 2 +- src/testdir/dumps/Test_popupwin_previewpopup_5.dump | 2 +- src/testdir/test_balloon_gui.vim | 5 +---- src/testdir/test_shortpathname.vim | 5 ++--- src/testdir/test_windows_home.vim | 5 ++--- src/version.c | 2 ++ 9 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_1.dump b/src/testdir/dumps/Test_popupwin_previewpopup_1.dump index f5ca4be2f..e65023e95 100644 --- a/src/testdir/dumps/Test_popupwin_previewpopup_1.dump +++ b/src/testdir/dumps/Test_popupwin_previewpopup_1.dump @@ -1,5 +1,5 @@ |o+0&#ffffff0|n|e| @71 -|t|w|o| @1|╔+0#0000001#ffd7ff255| |X|t|a|g|f|i|l|e| |═@30|X| +0#0000000#ffffff0@26 +|#|i|n|c|l|╔+0#0000001#ffd7ff255| |X|t|a|g|f|i|l|e| |═@30|X| +0#0000000#ffffff0@26 |t|h|r|e@1|║+0#0000001#ffd7ff255|2|0| @37| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@26 |f|o|u|r| |║+0#0000001#ffd7ff255|t|h|e|w|o|r|d| |i|s| |h|e|r|e| @24| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@26 |f|i|v|e| |║+0#0000001#ffd7ff255|2@1| @37| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@26 diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_2.dump b/src/testdir/dumps/Test_popupwin_previewpopup_2.dump index 5192b31d4..61de68a51 100644 --- a/src/testdir/dumps/Test_popupwin_previewpopup_2.dump +++ b/src/testdir/dumps/Test_popupwin_previewpopup_2.dump @@ -1,5 +1,5 @@ |o+0&#ffffff0|n|e| @71 -|t|w|o| @71 +|#|i|n|c|l|u|d|e| |"|X|h|e|a|d|e|r|.|h|"| @54 |t|h|r|e@1| @69 |f|o|u|r| @3|╔+0#0000001#ffd7ff255| |X|t|a|g|f|i|l|e| |═@30|X| +0#0000000#ffffff0@23 |f|i|v|e| @3|║+0#0000001#ffd7ff255|2|7| @37| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@23 diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_3.dump b/src/testdir/dumps/Test_popupwin_previewpopup_3.dump index 9958fdd47..f52a4bb1c 100644 --- a/src/testdir/dumps/Test_popupwin_previewpopup_3.dump +++ b/src/testdir/dumps/Test_popupwin_previewpopup_3.dump @@ -1,5 +1,5 @@ |o+0&#ffffff0|n|e| @71 -|t|w|o| @71 +|#|i|n|c|l|u|d|e| |"|X|h|e|a|d|e|r|.|h|"| @54 |t|h|r|e@1| @69 |f|o|u|r| @9|╔+0#0000001#ffd7ff255| |X|t|a|g|f|i|l|e| |═@30|X| +0#0000000#ffffff0@17 |f|i|v|e| @9|║+0#0000001#ffd7ff255|2|7| @37| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@17 diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_4.dump b/src/testdir/dumps/Test_popupwin_previewpopup_4.dump index fa973e724..bfaf9a508 100644 --- a/src/testdir/dumps/Test_popupwin_previewpopup_4.dump +++ b/src/testdir/dumps/Test_popupwin_previewpopup_4.dump @@ -1,5 +1,5 @@ |o+0&#ffffff0|n|e| @71 -|t|w|o| @71 +|#|i|n|c|l|u|d|e| |"|X|h|e|a|d|e|r|.|h|"| @54 |t|h|r|e@1| @69 |f|o|u|r| @70 |f|i|v|e| @27|╔+0#0000001#ffd7ff255| |X|t|a|g|f|i|l|e| |═@30|X diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_5.dump b/src/testdir/dumps/Test_popupwin_previewpopup_5.dump index 4932a0742..b167c69e7 100644 --- a/src/testdir/dumps/Test_popupwin_previewpopup_5.dump +++ b/src/testdir/dumps/Test_popupwin_previewpopup_5.dump @@ -1,5 +1,5 @@ |o+0&#ffffff0|n|e| @71 -|t|w|o| @71 +|#|i|n|c|l|u|d|e| |"|X|h|e|a|d|e|r|.|h|"| @54 |t|h|r|e@1| @69 |f|o|u|r| @70 |f|i|v|e| @27|╔+0#0000001#ffd7ff255| |t|e|s|t|d|i|r|/|X|t|a|g|f|i|l|e| |═@22|X diff --git a/src/testdir/test_balloon_gui.vim b/src/testdir/test_balloon_gui.vim index fd01309c1..5b486c0b7 100644 --- a/src/testdir/test_balloon_gui.vim +++ b/src/testdir/test_balloon_gui.vim @@ -1,10 +1,7 @@ " Tests for 'ballooneval' in the GUI. -if !has('gui_running') - throw 'Skipped: only works in the GUI' -endif - source check.vim +CheckGui CheckFeature balloon_eval func Test_balloon_show_gui() diff --git a/src/testdir/test_shortpathname.vim b/src/testdir/test_shortpathname.vim index 2d48f4b71..b88482016 100644 --- a/src/testdir/test_shortpathname.vim +++ b/src/testdir/test_shortpathname.vim @@ -1,9 +1,8 @@ " Test for shortpathname ':8' extension. " Only for use on Win32 systems! -if !has('win32') - throw 'Skipped: not on MS-Windows' -endif +source check.vim +CheckMSWindows func TestIt(file, bits, expected) let res = fnamemodify(a:file, a:bits) diff --git a/src/testdir/test_windows_home.vim b/src/testdir/test_windows_home.vim index 8ac9ce0fd..3c2db0144 100644 --- a/src/testdir/test_windows_home.vim +++ b/src/testdir/test_windows_home.vim @@ -1,8 +1,7 @@ " Test for $HOME on Windows. -if !has('win32') - throw 'Skipped: not on MS-Windows' -endif +source check.vim +CheckMSWindows let s:env = {} diff --git a/src/version.c b/src/version.c index 9c6eccf3e..4c2a83f7c 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1829, /**/ 1828, /**/ -- 2.40.0