commit 2c78a772fdb5f6a16d16a47e7f218051c4dcb845
author Bram Moolenaar <Bram@vim.org> Wed Dec 09 12:01:03 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Dec 09 12:01:03 2020 +0100
tree b8899b08604a9a4bc68c456be62c8c553f0f0ae7
parent 7257af477bc5f33153f8f700b643551525f1105b

patch 8.2.2116: MS-Windows GUI: test for 'guifont' is incomplete

Problem:    MS-Windows GUI: test for 'guifont' is incomplete.
Solution:   Set 'renderoptions'. (Christian Brabandt)

src/testdir/test_gui.vim

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 6d750e0..0d504d5 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -386,13 +386,18 @@
   if has('win32')
     " Invalid font names are accepted in GTK GUI
     call assert_fails('set guifont=xa1bc23d7f', 'E596:')
+  endif
 
+  if exists('+renderoptions')
     " doing this four times used to cause a crash
-    set guifont=
-    set guifont=
-    set guifont=
-    set guifont=
-    set guifont=
+    set renderoptions=type:directx
+    for i in range(5)
+      set guifont=
+    endfor
+    set renderoptions=
+    for i in range(5)
+      set guifont=
+    endfor
   endif
 
   if has('xfontset')

src/version.c

diff --git a/src/version.c b/src/version.c
index 3d48637..efb17f3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2116,
+/**/
     2115,
 /**/
     2114,