patch 8.0.0550: cannot parse some etags format tags file

Problem:    Some etags format tags file use 0x01, breaking the parsing.
Solution:   Use 0x02 for TAG_SEP. (James McCoy, closes #1614)

diff --git a/src/tag.c b/src/tag.c
index e2795b8052e2d7b5816f227db2160651450142bc..d6d1df272934491281dd45af18dd8b2a6ade4202 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -2355,18 +2355,19 @@ parse_line:
                }
                else
                {
-#define TAG_SEP 0x01
+#define TAG_SEP 0x02
                    size_t tag_fname_len = STRLEN(tag_fname);
 #ifdef FEAT_EMACS_TAGS
                    size_t ebuf_len = 0;
 #endif
 
                    /* Save the tag in a buffer.
-                    * Use 0x01 to separate fields (Can't use NUL, because the
-                    * hash key is terminated by NUL).
-                    * Emacs tag: <mtt><tag_fname><0x01><ebuf><0x01><lbuf><NUL>
-                    * other tag: <mtt><tag_fname><0x01><0x01><lbuf><NUL>
-                    * without Emacs tags: <mtt><tag_fname><0x01><lbuf><NUL>
+                    * Use 0x02 to separate fields (Can't use NUL because the
+                    * hash key is terminated by NUL, or Ctrl_A because that is
+                    * part of some Emacs tag files -- see parse_tag_line).
+                    * Emacs tag: <mtt><tag_fname><0x02><ebuf><0x02><lbuf><NUL>
+                    * other tag: <mtt><tag_fname><0x02><0x02><lbuf><NUL>
+                    * without Emacs tags: <mtt><tag_fname><0x02><lbuf><NUL>
                     * Here <mtt> is the "mtt" value plus 1 to avoid NUL.
                     */
                    len = (int)tag_fname_len + (int)STRLEN(lbuf) + 3;

diff --git a/src/testdir/test_taglist.vim b/src/testdir/test_taglist.vim
index b89b25eae2b3b6a4596bb7e634aceadb3466f037..2d1557ebd9398c84a63c2d543876043bed62dfc2 100644 (file)
--- a/src/testdir/test_taglist.vim
+++ b/src/testdir/test_taglist.vim
@@ -19,3 +19,40 @@ func Test_taglist()
   bwipe
 endfunc
 
+func Test_taglist_native_etags()
+  if !has('emacs_tags')
+    return
+  endif
+  call writefile([
+       \ "\x0c",
+       \ "src/os_unix.c,13491",
+       \ "set_signals(\x7f1335,32699",
+       \ "reset_signals(\x7f1407,34136",
+       \ ], 'Xtags')
+
+  set tags=Xtags
+
+  call assert_equal([['set_signals', '1335,32699'], ['reset_signals', '1407,34136']],
+       \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]}))
+
+  call delete('Xtags')
+endfunc
+
+func Test_taglist_ctags_etags()
+  if !has('emacs_tags')
+    return
+  endif
+  call writefile([
+       \ "\x0c",
+       \ "src/os_unix.c,13491",
+       \ "set_signals(void)\x7fset_signals\x011335,32699",
+       \ "reset_signals(void)\x7freset_signals\x011407,34136",
+       \ ], 'Xtags')
+
+  set tags=Xtags
+
+  call assert_equal([['set_signals', '1335,32699'], ['reset_signals', '1407,34136']],
+       \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]}))
+
+  call delete('Xtags')
+endfunc

diff --git a/src/version.c b/src/version.c
index 1ffb6556c65af0b208672b5d59b5078fb358bc77..aba7a80f582cdf06a1b48053cc68ec76030fef93 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    550,
 /**/
     549,
 /**/