|
 |
30e2bba |
To: vim-dev@vim.org
|
|
|
30e2bba |
Subject: Patch 7.0.096
|
|
|
30e2bba |
Fcc: outbox
|
|
|
30e2bba |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
30e2bba |
Mime-Version: 1.0
|
|
|
30e2bba |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
30e2bba |
Content-Transfer-Encoding: 8bit
|
|
|
30e2bba |
------------
|
|
|
30e2bba |
|
|
|
30e2bba |
Patch 7.0.096
|
|
|
30e2bba |
Problem: taglist() returns the filename relative to the tags file, while
|
|
|
30e2bba |
the directory of the tags file is unknown. (Hari Krishna Dara)
|
|
|
30e2bba |
Solution: Expand the file name. (Yegappan Lakshmanan)
|
|
|
30e2bba |
Files: src/tag.c
|
|
|
30e2bba |
|
|
|
30e2bba |
|
|
|
30e2bba |
*** ../vim-7.0.095/src/tag.c Thu Apr 27 23:40:34 2006
|
|
|
30e2bba |
--- src/tag.c Sun Sep 10 13:42:41 2006
|
|
|
30e2bba |
***************
|
|
|
30e2bba |
*** 3787,3792 ****
|
|
|
30e2bba |
--- 3787,3793 ----
|
|
|
30e2bba |
{
|
|
|
30e2bba |
int num_matches, i, ret;
|
|
|
30e2bba |
char_u **matches, *p;
|
|
|
30e2bba |
+ char_u *full_fname;
|
|
|
30e2bba |
dict_T *dict;
|
|
|
30e2bba |
tagptrs_T tp;
|
|
|
30e2bba |
long is_static;
|
|
|
30e2bba |
***************
|
|
|
30e2bba |
*** 3809,3823 ****
|
|
|
30e2bba |
if (list_append_dict(list, dict) == FAIL)
|
|
|
30e2bba |
ret = FAIL;
|
|
|
30e2bba |
|
|
|
30e2bba |
if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
|
|
|
30e2bba |
! || add_tag_field(dict, "filename", tp.fname,
|
|
|
30e2bba |
! tp.fname_end) == FAIL
|
|
|
30e2bba |
|| add_tag_field(dict, "cmd", tp.command,
|
|
|
30e2bba |
tp.command_end) == FAIL
|
|
|
30e2bba |
|| add_tag_field(dict, "kind", tp.tagkind,
|
|
|
30e2bba |
tp.tagkind_end) == FAIL
|
|
|
30e2bba |
|| dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
|
|
|
30e2bba |
ret = FAIL;
|
|
|
30e2bba |
|
|
|
30e2bba |
if (tp.command_end != NULL)
|
|
|
30e2bba |
{
|
|
|
30e2bba |
--- 3810,3827 ----
|
|
|
30e2bba |
if (list_append_dict(list, dict) == FAIL)
|
|
|
30e2bba |
ret = FAIL;
|
|
|
30e2bba |
|
|
|
30e2bba |
+ full_fname = tag_full_fname(&tp);
|
|
|
30e2bba |
if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
|
|
|
30e2bba |
! || add_tag_field(dict, "filename", full_fname,
|
|
|
30e2bba |
! NULL) == FAIL
|
|
|
30e2bba |
|| add_tag_field(dict, "cmd", tp.command,
|
|
|
30e2bba |
tp.command_end) == FAIL
|
|
|
30e2bba |
|| add_tag_field(dict, "kind", tp.tagkind,
|
|
|
30e2bba |
tp.tagkind_end) == FAIL
|
|
|
30e2bba |
|| dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
|
|
|
30e2bba |
ret = FAIL;
|
|
|
30e2bba |
+
|
|
|
30e2bba |
+ vim_free(full_fname);
|
|
|
30e2bba |
|
|
|
30e2bba |
if (tp.command_end != NULL)
|
|
|
30e2bba |
{
|
|
|
30e2bba |
*** ../vim-7.0.095/src/version.c Sun Sep 10 13:22:26 2006
|
|
|
30e2bba |
--- src/version.c Sun Sep 10 13:52:01 2006
|
|
|
30e2bba |
***************
|
|
|
30e2bba |
*** 668,669 ****
|
|
|
30e2bba |
--- 668,671 ----
|
|
|
30e2bba |
{ /* Add new patch number below this line */
|
|
|
30e2bba |
+ /**/
|
|
|
30e2bba |
+ 96,
|
|
|
30e2bba |
/**/
|
|
|
30e2bba |
|
|
|
30e2bba |
--
|
|
|
30e2bba |
The early bird gets the worm. If you want something else for
|
|
|
30e2bba |
breakfast, get up later.
|
|
|
30e2bba |
|
|
|
30e2bba |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
30e2bba |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
30e2bba |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
30e2bba |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|