home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 6.1.347 < prev    next >
Encoding:
Internet Message Format  |  2003-02-19  |  3.5 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.1.347
  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 6.1.347
  11. Problem:    When using cscope to list matching tags, the listed number is
  12.         sometimes not equal to what cscope uses. (Vihren Milev)
  13. Solution:   For cscope tags use only one table, don't give tags in the current
  14.         file a higher priority.
  15. Files:        src/tag.c
  16.  
  17.  
  18. *** ../vim61.346/src/tag.c    Wed Jan 29 22:08:43 2003
  19. --- src/tag.c    Sun Feb 16 16:05:01 2003
  20. ***************
  21. *** 1676,1719 ****
  22.            */
  23.           if (match)
  24.           {
  25. !         /* Decide in which array to store this match. */
  26. !         is_current = test_for_current(
  27.   #ifdef FEAT_EMACS_TAGS
  28. !             is_etag,
  29.   #endif
  30. !                  tagp.fname, tagp.fname_end, tag_fname);
  31.   #ifdef FEAT_EMACS_TAGS
  32. !         is_static = FALSE;
  33. !         if (!is_etag)    /* emacs tags are never static */
  34.   #endif
  35. !         {
  36.   #ifdef FEAT_TAG_OLDSTATIC
  37. !             if (tagp.tagname != lbuf)    /* detected static tag before */
  38. !             is_static = TRUE;
  39. !             else
  40.   #endif
  41. !             is_static = test_for_static(&tagp);
  42. !         }
  43.   
  44. !         /* decide in which of the six table to store this match */
  45. !         if (is_static)
  46. !         {
  47. !             if (is_current)
  48. !             mtt = MT_ST_CUR;
  49. !             else
  50. !             mtt = MT_ST_OTH;
  51. !         }
  52. !         else
  53. !         {
  54. !             if (is_current)
  55. !             mtt = MT_GL_CUR;
  56.               else
  57. !             mtt = MT_GL_OTH;
  58.           }
  59. -         if (regmatch.rm_ic && !match_no_ic)
  60. -             mtt += MT_IC_OFF;
  61. -         if (match_re)
  62. -             mtt += MT_RE_OFF;
  63.   
  64.           if (ga_grow(&ga_match[mtt], 1) == OK)
  65.           {
  66. --- 1676,1730 ----
  67.            */
  68.           if (match)
  69.           {
  70. ! #ifdef FEAT_CSCOPE
  71. !         if (use_cscope)
  72. !         {
  73. !             /* Don't change the ordering, always use the same table. */
  74. !             mtt = MT_GL_OTH;
  75. !         }
  76. !         else
  77. ! #endif
  78. !         {
  79. !             /* Decide in which array to store this match. */
  80. !             is_current = test_for_current(
  81.   #ifdef FEAT_EMACS_TAGS
  82. !                 is_etag,
  83.   #endif
  84. !                      tagp.fname, tagp.fname_end, tag_fname);
  85.   #ifdef FEAT_EMACS_TAGS
  86. !             is_static = FALSE;
  87. !             if (!is_etag)    /* emacs tags are never static */
  88.   #endif
  89. !             {
  90.   #ifdef FEAT_TAG_OLDSTATIC
  91. !             if (tagp.tagname != lbuf)
  92. !                 is_static = TRUE;    /* detected static tag before */
  93. !             else
  94.   #endif
  95. !                 is_static = test_for_static(&tagp);
  96. !             }
  97.   
  98. !             /* decide in which of the sixteen tables to store this
  99. !              * match */
  100. !             if (is_static)
  101. !             {
  102. !             if (is_current)
  103. !                 mtt = MT_ST_CUR;
  104. !             else
  105. !                 mtt = MT_ST_OTH;
  106. !             }
  107.               else
  108. !             {
  109. !             if (is_current)
  110. !                 mtt = MT_GL_CUR;
  111. !             else
  112. !                 mtt = MT_GL_OTH;
  113. !             }
  114. !             if (regmatch.rm_ic && !match_no_ic)
  115. !             mtt += MT_IC_OFF;
  116. !             if (match_re)
  117. !             mtt += MT_RE_OFF;
  118.           }
  119.   
  120.           if (ga_grow(&ga_match[mtt], 1) == OK)
  121.           {
  122. *** ../vim61.346/src/version.c    Thu Feb 20 21:36:44 2003
  123. --- src/version.c    Thu Feb 20 21:38:58 2003
  124. ***************
  125. *** 608,609 ****
  126. --- 612,615 ----
  127.   {   /* Add new patch number below this line */
  128. + /**/
  129. +     347,
  130.   /**/
  131.  
  132. -- 
  133. FATHER:    Did you kill all those guards?
  134. LAUNCELOT: Yes ...  I'm very sorry ...
  135. FATHER:    They cost fifty pounds each!
  136.                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  137.  
  138.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  139. ///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
  140. \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  141.  \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///
  142.