patch 9.0.1372: test for 'toolbariconsize' may fail

Problem:    Test for 'toolbariconsize' may fail.
Solution:   Only test 'toolbariconsize' when it is supported. (James McCoy,
            closes #12095)

diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 7bd42164d02b3c5b97f738e06e85d05990349247..b3b90d142901ca55fd715ae6073933e0dcbd7edd 100644 (file)
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -1642,6 +1642,8 @@ func Test_string_option_revert_on_failure()
   endif
   if exists('+toolbar')
     call add(optlist, ['toolbar', 'text', 'a123'])
+  endif
+  if exists('+toolbariconsize')
     call add(optlist, ['toolbariconsize', 'medium', 'a123'])
   endif
   if exists('+ttymouse') && !has('gui')

diff --git a/src/version.c b/src/version.c
index 56739e7630291305ad85b3fb2f003d7b02525766..bef7cf09c2aaed2ca98cdcc2715b62425dd0c8ff 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1372,
 /**/
     1371,
 /**/