updated for version 7.0-096

diff --git a/src/tag.c b/src/tag.c
index ee2539b85c2940f9a3ddf7cc497dc1fb3368d23a..bf68cdf0d149431435348ba856ccacffdb2bb4a6 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -3787,6 +3787,7 @@ get_tags(list, pat)
 {
     int                num_matches, i, ret;
     char_u     **matches, *p;
+    char_u     *full_fname;
     dict_T     *dict;
     tagptrs_T  tp;
     long       is_static;
@@ -3809,9 +3810,10 @@ get_tags(list, pat)
            if (list_append_dict(list, dict) == FAIL)
                ret = FAIL;
 
+           full_fname = tag_full_fname(&tp);
            if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
-                   || add_tag_field(dict, "filename", tp.fname,
-                                                        tp.fname_end) == FAIL
+                   || add_tag_field(dict, "filename", full_fname,
+                                                        NULL) == FAIL
                    || add_tag_field(dict, "cmd", tp.command,
                                                       tp.command_end) == FAIL
                    || add_tag_field(dict, "kind", tp.tagkind,
@@ -3819,6 +3821,8 @@ get_tags(list, pat)
                    || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
                ret = FAIL;
 
+           vim_free(full_fname);
+
            if (tp.command_end != NULL)
            {
                for (p = tp.command_end + 3;

diff --git a/src/version.c b/src/version.c
index 436188e797e95ec56652d4fff2dc86c640658342..b34add50f8e876ffac3195c236a759efb41d823a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    96,
 /**/
     95,
 /**/