@@ -1931,13 +1931,8 @@ find_tags(
19311931 {
19321932 vim_memset (& tagp , 0 , sizeof (tagp ));
19331933 tagp .tagname = lbuf ;
1934- #ifdef FEAT_TAG_ANYWHITE
1935- tagp .tagname_end = skiptowhite (lbuf );
1936- if (* tagp .tagname_end == NUL )
1937- #else
19381934 tagp .tagname_end = vim_strchr (lbuf , TAB );
19391935 if (tagp .tagname_end == NULL )
1940- #endif
19411936 {
19421937 if (vim_strchr (lbuf , NL ) == NULL )
19431938 {
@@ -1976,20 +1971,11 @@ find_tags(
19761971 if (* p == ':' )
19771972 {
19781973 if (tagp .fname == NULL )
1979- # ifdef FEAT_TAG_ANYWHITE
1980- tagp .fname = skipwhite (tagp .tagname_end );
1981- # else
19821974 tagp .fname = tagp .tagname_end + 1 ;
1983- # endif
1984- if ( fnamencmp (lbuf , tagp .fname , p - lbuf ) == 0
1985- # ifdef FEAT_TAG_ANYWHITE
1986- && VIM_ISWHITE (tagp .fname [p - lbuf ])
1987- # else
1988- && tagp .fname [p - lbuf ] == TAB
1989- # endif
1990- )
1975+ if (fnamencmp (lbuf , tagp .fname , p - lbuf ) == 0
1976+ && tagp .fname [p - lbuf ] == TAB )
19911977 {
1992- /* found one */
1978+ // found one
19931979 tagp .tagname = p + 1 ;
19941980 break ;
19951981 }
@@ -2112,20 +2098,10 @@ find_tags(
21122098#ifdef FEAT_TAG_OLDSTATIC
21132099 if (tagp .fname == NULL )
21142100#endif
2115- #ifdef FEAT_TAG_ANYWHITE
2116- tagp .fname = skipwhite (tagp .tagname_end );
2117- #else
21182101 tagp .fname = tagp .tagname_end + 1 ;
2119- #endif
2120- #ifdef FEAT_TAG_ANYWHITE
2121- tagp .fname_end = skiptowhite (tagp .fname );
2122- tagp .command = skipwhite (tagp .fname_end );
2123- if (* tagp .command == NUL )
2124- #else
21252102 tagp .fname_end = vim_strchr (tagp .fname , TAB );
21262103 tagp .command = tagp .fname_end + 1 ;
21272104 if (tagp .fname_end == NULL )
2128- #endif
21292105 i = FAIL ;
21302106 else
21312107 i = OK ;
@@ -2843,41 +2819,25 @@ parse_tag_line(
28432819 else /* not an Emacs tag */
28442820 {
28452821#endif
2846- /* Isolate the tagname, from lbuf up to the first white */
2822+ // Isolate the tagname, from lbuf up to the first white
28472823 tagp -> tagname = lbuf ;
2848- #ifdef FEAT_TAG_ANYWHITE
2849- p = skiptowhite (lbuf );
2850- #else
28512824 p = vim_strchr (lbuf , TAB );
28522825 if (p == NULL )
28532826 return FAIL ;
2854- #endif
28552827 tagp -> tagname_end = p ;
28562828
2857- /* Isolate file name, from first to second white space */
2858- #ifdef FEAT_TAG_ANYWHITE
2859- p = skipwhite (p );
2860- #else
2829+ // Isolate file name, from first to second white space
28612830 if (* p != NUL )
28622831 ++ p ;
2863- #endif
28642832 tagp -> fname = p ;
2865- #ifdef FEAT_TAG_ANYWHITE
2866- p = skiptowhite (p );
2867- #else
28682833 p = vim_strchr (p , TAB );
28692834 if (p == NULL )
28702835 return FAIL ;
2871- #endif
28722836 tagp -> fname_end = p ;
28732837
2874- /* find start of search command, after second white space */
2875- #ifdef FEAT_TAG_ANYWHITE
2876- p = skipwhite (p );
2877- #else
2838+ // find start of search command, after second white space
28782839 if (* p != NUL )
28792840 ++ p ;
2880- #endif
28812841 if (* p == NUL )
28822842 return FAIL ;
28832843 tagp -> command = p ;
0 commit comments