Mercurial > vim

comparison src/tag.c @ 11158:501f46f7644c v8.0.0466

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0466: still macros that should be all-caps commit https://github.com/vim/vim/commit/8820b48654b62472821d9b155fe03ab7ac13a05c Author: Bram Moolenaar <Bram@vim.org> Date: Thu Mar 16 17:23:31 2017 +0100 patch 8.0.0466: still macros that should be all-caps Problem: There are still a few macros that should be all-caps. Solution: Make a few more macros all-caps.
author Christian Brabandt <cb@256bit.org>
date Thu, 16 Mar 2017 17:30:06 +0100
parents f4ea50924c6d
children d3415ec1cdaf
comparison
equal deleted inserted replaced
11157:35a1705f4d02 11158:501f46f7644c
603 if (taglen > Columns - 25) 603 if (taglen > Columns - 25)
604 taglen = MAXCOL; 604 taglen = MAXCOL;
605 if (msg_col == 0) 605 if (msg_col == 0)
606 msg_didout = FALSE; /* overwrite previous message */ 606 msg_didout = FALSE; /* overwrite previous message */
607 msg_start(); 607 msg_start();
608 MSG_PUTS_ATTR(_(" # pri kind tag"), hl_attr(HLF_T)); 608 MSG_PUTS_ATTR(_(" # pri kind tag"), HL_ATTR(HLF_T));
609 msg_clr_eos(); 609 msg_clr_eos();
610 taglen_advance(taglen); 610 taglen_advance(taglen);
611 MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T)); 611 MSG_PUTS_ATTR(_("file\n"), HL_ATTR(HLF_T));
612 612
613 for (i = 0; i < num_matches && !got_int; ++i) 613 for (i = 0; i < num_matches && !got_int; ++i)
614 { 614 {
615 parse_match(matches[i], &tagp); 615 parse_match(matches[i], &tagp);
616 if (!new_tag && ( 616 if (!new_tag && (
631 msg_outtrans_len(tagp.tagkind, 631 msg_outtrans_len(tagp.tagkind,
632 (int)(tagp.tagkind_end - tagp.tagkind)); 632 (int)(tagp.tagkind_end - tagp.tagkind));
633 msg_advance(13); 633 msg_advance(13);
634 msg_outtrans_len_attr(tagp.tagname, 634 msg_outtrans_len_attr(tagp.tagname,
635 (int)(tagp.tagname_end - tagp.tagname), 635 (int)(tagp.tagname_end - tagp.tagname),
636 hl_attr(HLF_T)); 636 HL_ATTR(HLF_T));
637 msg_putchar(' '); 637 msg_putchar(' ');
638 taglen_advance(taglen); 638 taglen_advance(taglen);
639 639
640 /* Find out the actual file name. If it is long, truncate 640 /* Find out the actual file name. If it is long, truncate
641 * it and put "..." in the middle */ 641 * it and put "..." in the middle */
642 p = tag_full_fname(&tagp); 642 p = tag_full_fname(&tagp);
643 if (p != NULL) 643 if (p != NULL)
644 { 644 {
645 msg_puts_long_attr(p, hl_attr(HLF_D)); 645 msg_puts_long_attr(p, HL_ATTR(HLF_D));
646 vim_free(p); 646 vim_free(p);
647 } 647 }
648 if (msg_col > 0) 648 if (msg_col > 0)
649 msg_putchar('\n'); 649 msg_putchar('\n');
650 if (got_int) 650 if (got_int)
675 { 675 {
676 p = tagp.tagkind_end; 676 p = tagp.tagkind_end;
677 continue; 677 continue;
678 } 678 }
679 /* print all other extra fields */ 679 /* print all other extra fields */
680 attr = hl_attr(HLF_CM); 680 attr = HL_ATTR(HLF_CM);
681 while (*p && *p != '\r' && *p != '\n') 681 while (*p && *p != '\r' && *p != '\n')
682 { 682 {
683 if (msg_col + ptr2cells(p) >= Columns) 683 if (msg_col + ptr2cells(p) >= Columns)
684 { 684 {
685 msg_putchar('\n'); 685 msg_putchar('\n');
1001 STRCAT(IObuff, _(" Using tag with different case!")); 1001 STRCAT(IObuff, _(" Using tag with different case!"));
1002 if ((num_matches > prev_num_matches || new_tag) 1002 if ((num_matches > prev_num_matches || new_tag)
1003 && num_matches > 1) 1003 && num_matches > 1)
1004 { 1004 {
1005 if (ic) 1005 if (ic)
1006 msg_attr(IObuff, hl_attr(HLF_W)); 1006 msg_attr(IObuff, HL_ATTR(HLF_W));
1007 else 1007 else
1008 msg(IObuff); 1008 msg(IObuff);
1009 msg_scroll = TRUE; /* don't overwrite this message */ 1009 msg_scroll = TRUE; /* don't overwrite this message */
1010 } 1010 }
1011 else 1011 else
1138 tagstack[i].cur_match + 1, 1138 tagstack[i].cur_match + 1,
1139 tagstack[i].tagname, 1139 tagstack[i].tagname,
1140 tagstack[i].fmark.mark.lnum); 1140 tagstack[i].fmark.mark.lnum);
1141 msg_outtrans(IObuff); 1141 msg_outtrans(IObuff);
1142 msg_outtrans_attr(name, tagstack[i].fmark.fnum == curbuf->b_fnum 1142 msg_outtrans_attr(name, tagstack[i].fmark.fnum == curbuf->b_fnum
1143 ? hl_attr(HLF_D) : 0); 1143 ? HL_ATTR(HLF_D) : 0);
1144 vim_free(name); 1144 vim_free(name);
1145 } 1145 }
1146 out_flush(); /* show one line at a time */ 1146 out_flush(); /* show one line at a time */
1147 } 1147 }
1148 if (tagstackidx == tagstacklen) /* idx at top of stack */ 1148 if (tagstackidx == tagstacklen) /* idx at top of stack */