patch 8.2.0810: error when appending "tagfile" to 'wildoptions'

Problem:    Error when appending "tagfile" to 'wildoptions'.
Solution:   use flags P_ONECOMMA and P_NODUP. (Dmitri Vereshchagin,
            closes #6105)

diff --git a/src/optiondefs.h b/src/optiondefs.h
index 36701070dd1123cef789ee1240a52de431f1389b..374764be6bec5d406a747b6fe27cbc84641cb6d4 100644 (file)
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -2837,7 +2837,7 @@ static struct vimoption options[] =
     {"wildmode",    "wim",  P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
                            (char_u *)&p_wim, PV_NONE,
                            {(char_u *)"full", (char_u *)0L} SCTX_INIT},
-    {"wildoptions", "wop",  P_STRING|P_VI_DEF,
+    {"wildoptions", "wop",  P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
                            (char_u *)&p_wop, PV_NONE,
                            {(char_u *)"", (char_u *)0L}
                            SCTX_INIT},

diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index ce925d8172e8b618d60d55fa263a7deb390edfe1..17ae09496b01ef0d12c4fd093dc107bc29acf744 100644 (file)
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -60,6 +60,13 @@ func Test_wildchar()
   set wildchar&
 endfunc
 
+func Test_wildoptions()
+  set wildoptions=
+  set wildoptions+=tagfile
+  set wildoptions+=tagfile
+  call assert_equal('tagfile', &wildoptions)
+endfunc
+
 func Test_options_command()
   let caught = 'ok'
   try

diff --git a/src/version.c b/src/version.c
index 1ca9dee70b2d78e83ee1c58696854c36f4b7b488..9e8ba9288e4c78aa695ceaf370973f0b8b5749a2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    810,
 /**/
     809,
 /**/