• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision33a67d1dcaf074f62e27cd9e2581746f84d79af0 (tree)
Time2020-05-22 21:15:03
AuthorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

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

Commit: https://github.com/vim/vim/commit/2e61e2d08390623fcf933fd06646ac91f81fb772
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 22 14:10:36 2020 +0200

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)

Change Summary

Incremental Difference

diff -r 07f529a41696 -r 33a67d1dcaf0 src/optiondefs.h
--- a/src/optiondefs.h Fri May 22 13:45:04 2020 +0200
+++ b/src/optiondefs.h Fri May 22 14:15:03 2020 +0200
@@ -2837,7 +2837,7 @@
28372837 {"wildmode", "wim", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
28382838 (char_u *)&p_wim, PV_NONE,
28392839 {(char_u *)"full", (char_u *)0L} SCTX_INIT},
2840- {"wildoptions", "wop", P_STRING|P_VI_DEF,
2840+ {"wildoptions", "wop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
28412841 (char_u *)&p_wop, PV_NONE,
28422842 {(char_u *)"", (char_u *)0L}
28432843 SCTX_INIT},
diff -r 07f529a41696 -r 33a67d1dcaf0 src/testdir/test_options.vim
--- a/src/testdir/test_options.vim Fri May 22 13:45:04 2020 +0200
+++ b/src/testdir/test_options.vim Fri May 22 14:15:03 2020 +0200
@@ -60,6 +60,13 @@
6060 set wildchar&
6161 endfunc
6262
63+func Test_wildoptions()
64+ set wildoptions=
65+ set wildoptions+=tagfile
66+ set wildoptions+=tagfile
67+ call assert_equal('tagfile', &wildoptions)
68+endfunc
69+
6370 func Test_options_command()
6471 let caught = 'ok'
6572 try
diff -r 07f529a41696 -r 33a67d1dcaf0 src/version.c
--- a/src/version.c Fri May 22 13:45:04 2020 +0200
+++ b/src/version.c Fri May 22 14:15:03 2020 +0200
@@ -747,6 +747,8 @@
747747 static int included_patches[] =
748748 { /* Add new patch number below this line */
749749 /**/
750+ 810,
751+/**/
750752 809,
751753 /**/
752754 808,
Show on old repository browser