diff options
| -rw-r--r-- | src/tag.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_taglist.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 30 insertions, 0 deletions
@@ -3412,6 +3412,11 @@ get_tagfname( // move the filename one char forward and truncate the // filepath with a NUL filename = gettail(buf); + if (r_ptr != NULL) + { + STRMOVE(r_ptr + 1, r_ptr); + ++r_ptr; + } STRMOVE(filename + 1, filename); *filename++ = NUL; diff --git a/src/testdir/test_taglist.vim b/src/testdir/test_taglist.vim index 2dd236683b..136acb3dcd 100644 --- a/src/testdir/test_taglist.vim +++ b/src/testdir/test_taglist.vim @@ -127,6 +127,29 @@ func Test_tagsfile_without_trailing_newline() set tags& endfunc +" Check that specifying a stop directory in 'tags' works properly. +func Test_tagfiles_stopdir() + let save_cwd = getcwd() + + call mkdir('Xtagsdir1/Xtagsdir2/Xtagsdir3', 'pR') + call writefile([], 'Xtagsdir1/Xtags', 'D') + + cd Xtagsdir1/ + let &tags = './Xtags;' .. fnamemodify('./..', ':p') + call assert_equal(1, len(tagfiles())) + + cd Xtagsdir2/ + let &tags = './Xtags;' .. fnamemodify('./..', ':p') + call assert_equal(1, len(tagfiles())) + + cd Xtagsdir3/ + let &tags = './Xtags;' .. fnamemodify('./..', ':p') + call assert_equal(0, len(tagfiles())) + + set tags& + call chdir(save_cwd) +endfunc + " Test for ignoring comments in a tags file func Test_tagfile_ignore_comments() call writefile([ diff --git a/src/version.c b/src/version.c index 70254cc431..9c16d1772d 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 565, +/**/ 564, /**/ 563, |