# HG changeset patch # User Christian Brabandt # Date 1485289804 -3600 # Node ID fa6c4825a1c449c603995d8e43729cabee970ba9 # Parent 6c1e9dc7caf1f61c2ceebe6d47b6aa51006f5289 patch 8.0.0237: when 'wildoptions' is "tagfile" completion may not work commit https://github.com/vim/vim/commit/ba47b51ff88d91c9bb5aa522183e23a656865697 Author: Bram Moolenaar Date: Tue Jan 24 21:18:19 2017 +0100 patch 8.0.0237: when 'wildoptions' is "tagfile" completion may not work Problem: When setting wildoptions=tagfile the completion context is not set correctly. (desjardins) Solution: Check for EXPAND_TAGS_LISTFILES. (Christian Brabandt, closes #1399) diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4366,7 +4366,9 @@ addstar( || context == EXPAND_OWNSYNTAX || context == EXPAND_FILETYPE || context == EXPAND_PACKADD - || (context == EXPAND_TAGS && fname[0] == '/')) + || ((context == EXPAND_TAGS_LISTFILES + || context == EXPAND_TAGS) + && fname[0] == '/')) retval = vim_strnsave(fname, len); else { diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -295,3 +295,14 @@ func Test_illegal_address() 2;') quit endfunc + +func Test_cmdline_complete_wildoptions() + help + call feedkeys(":tag /\\\"\", 'tx') + let a = join(sort(split(@:)),' ') + set wildoptions=tagfile + call feedkeys(":tag /\\\"\", 'tx') + let b = join(sort(split(@:)),' ') + call assert_equal(a, b) + bw! +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 237, +/**/ 236, /**/ 235,