7.0.096

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.0.096
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.0.096
  11 Problem:    taglist() returns the filename relative to the tags file, while
  12             the directory of the tags file is unknown. (Hari Krishna Dara)
  13 Solution:   Expand the file name. (Yegappan Lakshmanan)
  14 Files:      src/tag.c
  15
  16
  17 *** ../vim-7.0.095/src/tag.c    Thu Apr 27 23:40:34 2006
  18 --- src/tag.c   Sun Sep 10 13:42:41 2006
  19 ***************
  20 *** 3787,3792 ****
  21 --- 3787,3793 ----
  22   {
  23       int               num_matches, i, ret;
  24       char_u    **matches, *p;
  25 +     char_u    *full_fname;
  26       dict_T    *dict;
  27       tagptrs_T tp;
  28       long      is_static;
  29 ***************
  30 *** 3809,3823 ****
  31             if (list_append_dict(list, dict) == FAIL)
  32                 ret = FAIL;
  33
  34             if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
  35 !                   || add_tag_field(dict, "filename", tp.fname,
  36 !                                                        tp.fname_end) == FAIL
  37                     || add_tag_field(dict, "cmd", tp.command,
  38                                                        tp.command_end) == FAIL
  39                     || add_tag_field(dict, "kind", tp.tagkind,
  40                                                       tp.tagkind_end) == FAIL
  41                     || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
  42                 ret = FAIL;
  43
  44             if (tp.command_end != NULL)
  45             {
  46 --- 3810,3827 ----
  47             if (list_append_dict(list, dict) == FAIL)
  48                 ret = FAIL;
  49
  50 +           full_fname = tag_full_fname(&tp);
  51             if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
  52 !                   || add_tag_field(dict, "filename", full_fname,
  53 !                                                        NULL) == FAIL
  54                     || add_tag_field(dict, "cmd", tp.command,
  55                                                        tp.command_end) == FAIL
  56                     || add_tag_field(dict, "kind", tp.tagkind,
  57                                                       tp.tagkind_end) == FAIL
  58                     || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
  59                 ret = FAIL;
  60 +
  61 +           vim_free(full_fname);
  62
  63             if (tp.command_end != NULL)
  64             {
  65 *** ../vim-7.0.095/src/version.c        Sun Sep 10 13:22:26 2006
  66 --- src/version.c       Sun Sep 10 13:52:01 2006
  67 ***************
  68 *** 668,669 ****
  69 --- 668,671 ----
  70   {   /* Add new patch number below this line */
  71 + /**/
  72 +     96,
  73   /**/
  74
  75 --
  76 The early bird gets the worm. If you want something else for
  77 breakfast, get up later.
  78
  79  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  80 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  81 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  82  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///