diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-28 23:13:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-28 23:13:40 +0100 |
| commit | 3650fd709807d5ac182e28d952cbd790c1ad0a6a (patch) | |
| tree | d6bad773e15018bc76fd7a441a1ac5f6aa88ba9a | |
| parent | 057e84afe5bd37fe272bf7cfafca629ef9da1bd3 (diff) | |
| download | vim-git-3650fd709807d5ac182e28d952cbd790c1ad0a6a.tar.gz | |
patch 8.2.2559: MS-Windows: guifont test fails on Windows XPv8.2.2559
Problem: MS-Windows: guifont test fails on Windows XP.
Solution: Check windowsversion().
| -rw-r--r-- | src/testdir/test_gui.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2559, +/**/ 2558, /**/ 2557, |