To: vim_dev@googlegroups.com Subject: Patch 8.2.0810 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0810 Problem: Error when appending "tagfile" to 'wildoptions'. Solution: use flags P_ONECOMMA and P_NODUP. (Dmitri Vereshchagin, closes #6105) Files: src/optiondefs.h, src/testdir/test_options.vim *** ../vim-8.2.0809/src/optiondefs.h 2020-01-18 15:53:15.954799326 +0100 --- src/optiondefs.h 2020-05-22 14:09:19.220029708 +0200 *************** *** 2837,2843 **** {"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, (char_u *)&p_wop, PV_NONE, {(char_u *)"", (char_u *)0L} SCTX_INIT}, --- 2837,2843 ---- {"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|P_ONECOMMA|P_NODUP, (char_u *)&p_wop, PV_NONE, {(char_u *)"", (char_u *)0L} SCTX_INIT}, *** ../vim-8.2.0809/src/testdir/test_options.vim 2020-05-07 18:43:40.867365982 +0200 --- src/testdir/test_options.vim 2020-05-22 14:07:26.292422465 +0200 *************** *** 60,65 **** --- 60,72 ---- 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 *** ../vim-8.2.0809/src/version.c 2020-05-22 13:38:15.606498510 +0200 --- src/version.c 2020-05-22 14:09:01.304092026 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 810, /**/ -- hundred-and-one symptoms of being an internet addict: 160. You get in the elevator and double-click the button for the floor you want. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///