projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| b4704371 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.007 | |
| 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.2.007 | |
| 11 | Problem: Listing tags for Cscope doesn't always work. | |
| 12 | Solution: Avoid using smgs_attr(). (Sergey Khorev) | |
| 13 | Files: src/if_cscope.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.006/src/if_cscope.c Fri May 30 23:16:45 2003 | |
| 17 | --- src/if_cscope.c Tue Jun 3 20:39:43 2003 | |
| 18 | *************** | |
| 19 | *** 1824,1829 **** | |
| 20 | --- 1824,1831 ---- | |
| 21 | char *globalcntx = "GLOBAL"; | |
| 22 | char *cntxformat = " <<%s>>"; | |
| 23 | char *context; | |
| 24 | + char *cstag_msg = _("Cscope tag: %s"); | |
| 25 | + char *csfmt_str = "%4d %6s "; | |
| 26 | ||
| 27 | assert (num_matches > 0); | |
| 28 | ||
| 29 | *************** | |
| 30 | *** 1833,1839 **** | |
| 31 | strcpy(tbuf, matches[0]); | |
| 32 | ptag = strtok(tbuf, "\t"); | |
| 33 | ||
| 34 | ! (void)smsg_attr(hl_attr(HLF_T), (char_u *)_("Cscope tag: %s"), ptag); | |
| 35 | ||
| 36 | vim_free(tbuf); | |
| 37 | ||
| 38 | --- 1835,1848 ---- | |
| 39 | strcpy(tbuf, matches[0]); | |
| 40 | ptag = strtok(tbuf, "\t"); | |
| 41 | ||
| 42 | ! newsize = strlen(cstag_msg) + strlen(ptag); | |
| 43 | ! buf = (char *)alloc(newsize); | |
| 44 | ! if (buf != NULL) | |
| 45 | ! { | |
| 46 | ! bufsize = newsize; | |
| 47 | ! (void)sprintf(buf, cstag_msg, ptag); | |
| 48 | ! MSG_PUTS_ATTR(buf, hl_attr(HLF_T)); | |
| 49 | ! } | |
| 50 | ||
| 51 | vim_free(tbuf); | |
| 52 | ||
| 53 | *************** | |
| 54 | *** 1921,1927 **** | |
| 55 | ||
| 56 | lno[strlen(lno)-2] = '\0'; /* ignore ;" at the end */ | |
| 57 | ||
| 58 | ! (void)smsg_attr(hl_attr(HLF_CM), (char_u *)"%4d %6s ", num, lno); | |
| 59 | MSG_PUTS_LONG_ATTR(cs_pathcomponents(fname), hl_attr(HLF_CM)); | |
| 60 | ||
| 61 | /* compute the required space for the context */ | |
| 62 | --- 1930,1951 ---- | |
| 63 | ||
| 64 | lno[strlen(lno)-2] = '\0'; /* ignore ;" at the end */ | |
| 65 | ||
| 66 | ! /* hopefully 'num' (num of matches) will be less than 10^16 */ | |
| 67 | ! newsize = strlen(csfmt_str) + 16 + strlen(lno); | |
| 68 | ! if (bufsize < newsize) | |
| 69 | ! { | |
| 70 | ! buf = (char *)vim_realloc(buf, newsize); | |
| 71 | ! if (buf == NULL) | |
| 72 | ! bufsize = 0; | |
| 73 | ! else | |
| 74 | ! bufsize = newsize; | |
| 75 | ! } | |
| 76 | ! if (buf != NULL) | |
| 77 | ! { | |
| 78 | ! /* csfmt_str = "%4d %6s "; */ | |
| 79 | ! (void)sprintf(buf, csfmt_str, num, lno); | |
| 80 | ! MSG_PUTS_ATTR(buf, hl_attr(HLF_CM)); | |
| 81 | ! } | |
| 82 | MSG_PUTS_LONG_ATTR(cs_pathcomponents(fname), hl_attr(HLF_CM)); | |
| 83 | ||
| 84 | /* compute the required space for the context */ | |
| 85 | *** ../vim-6.2.006/src/version.c Mon Jun 2 22:26:17 2003 | |
| 86 | --- src/version.c Tue Jun 3 20:38:45 2003 | |
| 87 | *************** | |
| 88 | *** 632,633 **** | |
| 89 | --- 632,635 ---- | |
| 90 | { /* Add new patch number below this line */ | |
| 91 | + /**/ | |
| 92 | + 7, | |
| 93 | /**/ | |
| 94 | ||
| 95 | -- | |
| 96 | hundred-and-one symptoms of being an internet addict: | |
| 97 | 81. At social functions you introduce your husband as "my domain server." | |
| 98 | ||
| 99 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 100 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 101 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 102 | \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html /// |