diff options
| -rw-r--r-- | src/tag.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_taglist.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 20 insertions, 3 deletions
@@ -1943,14 +1943,16 @@ line_read_in: } parse_line: - if (vim_strchr(lbuf, NL) == NULL + // When the line is too long the NUL will not be in the + // last-but-one byte (see vim_fgets()). + // Has been reported for Mozilla JS with extremely long names. + // In that case we can't parse it and we ignore the line. + if (lbuf[LSIZE - 2] != NUL #ifdef FEAT_CSCOPE && !use_cscope #endif ) { - // Truncated line, ignore it. Has been reported for - // Mozilla JS with extremely long names. if (p_verbose >= 5) { verbose_enter(); diff --git a/src/testdir/test_taglist.vim b/src/testdir/test_taglist.vim index de9ca0c809..6506c3f1d1 100644 --- a/src/testdir/test_taglist.vim +++ b/src/testdir/test_taglist.vim @@ -98,3 +98,16 @@ func Test_tagfiles() call delete('Xtags2') bd endfunc + +" For historical reasons we support a tags file where the last line is missing +" the newline. +func Test_tagsfile_without_trailing_newline() + call writefile(["Foo\tfoo\t1"], 'Xtags', 'b') + set tags=Xtags + + let tl = taglist('.*') + call assert_equal(1, len(tl)) + call assert_equal('Foo', tl[0].name) + + call delete('Xtags') +endfunc diff --git a/src/version.c b/src/version.c index 1b38d299ac..bb112db467 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1100, +/**/ 1099, /**/ 1098, |