summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2006-09-10 11:56:59 +0000
committervimboss <devnull@localhost>2006-09-10 11:56:59 +0000
commitbd956d4e4031b8bb5768b720688180cf5a616f91 (patch)
tree260d54de7f90f5be106a28822722dedc40e4908a
parent1f8769897c51b277cba9d62eb4f66311ba8b8f29 (diff)
downloadvim-bd956d4e4031b8bb5768b720688180cf5a616f91.tar.gz
updated for version 7.0-096v7.0.096v7-0-096
-rw-r--r--src/tag.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/tag.c b/src/tag.c
index ee2539b8..bf68cdf0 100644
--- 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 436188e7..b34add50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 96,
+/**/
95,
/**/
94,