From 3650fd709807d5ac182e28d952cbd790c1ad0a6a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 28 Feb 2021 23:13:40 +0100 Subject: [PATCH] patch 8.2.2559: MS-Windows: guifont test fails on Windows XP Problem: MS-Windows: guifont test fails on Windows XP. Solution: Check windowsversion(). --- src/testdir/test_gui.vim | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 0d504d549..69f140b71 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -388,7 +388,9 @@ func Test_set_guifont() call assert_fails('set guifont=xa1bc23d7f', 'E596:') endif - if exists('+renderoptions') + " This only works if 'renderoptions' exists and does not work for Windows XP + " and older. + if exists('+renderoptions') && windowsversion() !~ '^[345]\.' " doing this four times used to cause a crash set renderoptions=type:directx for i in range(5) diff --git a/src/version.c b/src/version.c index b623c4218..67fc08c68 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2559, /**/ 2558, /**/ -- 2.40.0