Skip to content

Commit 2c78a77

Browse files
committed
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)
1 parent 7257af4 commit 2c78a77

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

src/testdir/test_gui.vim

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,18 @@ func Test_set_guifont()
386386
if has('win32')
387387
" Invalid font names are accepted in GTK GUI
388388
call assert_fails('set guifont=xa1bc23d7f', 'E596:')
389+
endif
389390

391+
if exists('+renderoptions')
390392
" doing this four times used to cause a crash
391-
set guifont=
392-
set guifont=
393-
set guifont=
394-
set guifont=
395-
set guifont=
393+
set renderoptions=type:directx
394+
for i in range(5)
395+
set guifont=
396+
endfor
397+
set renderoptions=
398+
for i in range(5)
399+
set guifont=
400+
endfor
396401
endif
397402

398403
if has('xfontset')

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2116,
753755
/**/
754756
2115,
755757
/**/

0 commit comments

Comments
 (0)