Mercurial > vim

comparison src/diff.c @ 11129:f4ea50924c6d v8.0.0452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0452: some macros are in lower case commit https://github.com/vim/vim/commit/1c46544412382db8b3203d6c78e550df885540bd Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 12 20:10:05 2017 +0100 patch 8.0.0452: some macros are in lower case Problem: Some macros are in lower case. Solution: Make a few more macros upper case.
author Christian Brabandt <cb@256bit.org>
date Sun, 12 Mar 2017 20:15:06 +0100
parents 778c10516955
children eba1a8c6e21d
comparison
equal deleted inserted replaced
11128:23154628ab7f 11129:f4ea50924c6d
1665 /* Ignore white space changes and possibly ignore case. */ 1665 /* Ignore white space changes and possibly ignore case. */
1666 p1 = s1; 1666 p1 = s1;
1667 p2 = s2; 1667 p2 = s2;
1668 while (*p1 != NUL && *p2 != NUL) 1668 while (*p1 != NUL && *p2 != NUL)
1669 { 1669 {
1670 if (vim_iswhite(*p1) && vim_iswhite(*p2)) 1670 if (VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
1671 { 1671 {
1672 p1 = skipwhite(p1); 1672 p1 = skipwhite(p1);
1673 p2 = skipwhite(p2); 1673 p2 = skipwhite(p2);
1674 } 1674 }
1675 else 1675 else
1992 /* Search for start of difference */ 1992 /* Search for start of difference */
1993 si_org = si_new = 0; 1993 si_org = si_new = 0;
1994 while (line_org[si_org] != NUL) 1994 while (line_org[si_org] != NUL)
1995 { 1995 {
1996 if ((diff_flags & DIFF_IWHITE) 1996 if ((diff_flags & DIFF_IWHITE)
1997 && vim_iswhite(line_org[si_org]) 1997 && VIM_ISWHITE(line_org[si_org])
1998 && vim_iswhite(line_new[si_new])) 1998 && VIM_ISWHITE(line_new[si_new]))
1999 { 1999 {
2000 si_org = (int)(skipwhite(line_org + si_org) - line_org); 2000 si_org = (int)(skipwhite(line_org + si_org) - line_org);
2001 si_new = (int)(skipwhite(line_new + si_new) - line_new); 2001 si_new = (int)(skipwhite(line_new + si_new) - line_new);
2002 } 2002 }
2003 else 2003 else
2027 ei_new = (int)STRLEN(line_new); 2027 ei_new = (int)STRLEN(line_new);
2028 while (ei_org >= *startp && ei_new >= si_new 2028 while (ei_org >= *startp && ei_new >= si_new
2029 && ei_org >= 0 && ei_new >= 0) 2029 && ei_org >= 0 && ei_new >= 0)
2030 { 2030 {
2031 if ((diff_flags & DIFF_IWHITE) 2031 if ((diff_flags & DIFF_IWHITE)
2032 && vim_iswhite(line_org[ei_org]) 2032 && VIM_ISWHITE(line_org[ei_org])
2033 && vim_iswhite(line_new[ei_new])) 2033 && VIM_ISWHITE(line_new[ei_new]))
2034 { 2034 {
2035 while (ei_org >= *startp 2035 while (ei_org >= *startp
2036 && vim_iswhite(line_org[ei_org])) 2036 && VIM_ISWHITE(line_org[ei_org]))
2037 --ei_org; 2037 --ei_org;
2038 while (ei_new >= si_new 2038 while (ei_new >= si_new
2039 && vim_iswhite(line_new[ei_new])) 2039 && VIM_ISWHITE(line_new[ei_new]))
2040 --ei_new; 2040 --ei_new;
2041 } 2041 }
2042 else 2042 else
2043 { 2043 {
2044 if (line_org[ei_org] != line_new[ei_new]) 2044 if (line_org[ei_org] != line_new[ei_new])
2200 } 2200 }
2201 else 2201 else
2202 { 2202 {
2203 /* Buffer number or pattern given. Ignore trailing white space. */ 2203 /* Buffer number or pattern given. Ignore trailing white space. */
2204 p = eap->arg + STRLEN(eap->arg); 2204 p = eap->arg + STRLEN(eap->arg);
2205 while (p > eap->arg && vim_iswhite(p[-1])) 2205 while (p > eap->arg && VIM_ISWHITE(p[-1]))
2206 --p; 2206 --p;
2207 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i) 2207 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2208 ; 2208 ;
2209 if (eap->arg + i == p) /* digits only */ 2209 if (eap->arg + i == p) /* digits only */
2210 i = atol((char *)eap->arg); 2210 i = atol((char *)eap->arg);