Mercurial > vim

comparison src/fold.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 506f5d8b7d8b
children 8d9ecf09183a
comparison
equal deleted inserted replaced
11128:23154628ab7f 11129:f4ea50924c6d
1968 #endif 1968 #endif
1969 { 1969 {
1970 long count = (long)(lnume - lnum + 1); 1970 long count = (long)(lnume - lnum + 1);
1971 1971
1972 vim_snprintf((char *)buf, FOLD_TEXT_LEN, 1972 vim_snprintf((char *)buf, FOLD_TEXT_LEN,
1973 ngettext("+--%3ld line folded ", 1973 NGETTEXT("+--%3ld line folded ",
1974 "+--%3ld lines folded ", count), 1974 "+--%3ld lines folded ", count),
1975 count); 1975 count);
1976 text = buf; 1976 text = buf;
1977 } 1977 }
1978 return text; 1978 return text;
1996 int did2 = FALSE; 1996 int did2 = FALSE;
1997 1997
1998 /* Ignore leading and trailing white space in 'commentstring'. */ 1998 /* Ignore leading and trailing white space in 'commentstring'. */
1999 cms_start = skipwhite(curbuf->b_p_cms); 1999 cms_start = skipwhite(curbuf->b_p_cms);
2000 cms_slen = (int)STRLEN(cms_start); 2000 cms_slen = (int)STRLEN(cms_start);
2001 while (cms_slen > 0 && vim_iswhite(cms_start[cms_slen - 1])) 2001 while (cms_slen > 0 && VIM_ISWHITE(cms_start[cms_slen - 1]))
2002 --cms_slen; 2002 --cms_slen;
2003 2003
2004 /* locate "%s" in 'commentstring', use the part before and after it. */ 2004 /* locate "%s" in 'commentstring', use the part before and after it. */
2005 cms_end = (char_u *)strstr((char *)cms_start, "%s"); 2005 cms_end = (char_u *)strstr((char *)cms_start, "%s");
2006 if (cms_end != NULL) 2006 if (cms_end != NULL)
2007 { 2007 {
2008 cms_elen = cms_slen - (int)(cms_end - cms_start); 2008 cms_elen = cms_slen - (int)(cms_end - cms_start);
2009 cms_slen = (int)(cms_end - cms_start); 2009 cms_slen = (int)(cms_end - cms_start);
2010 2010
2011 /* exclude white space before "%s" */ 2011 /* exclude white space before "%s" */
2012 while (cms_slen > 0 && vim_iswhite(cms_start[cms_slen - 1])) 2012 while (cms_slen > 0 && VIM_ISWHITE(cms_start[cms_slen - 1]))
2013 --cms_slen; 2013 --cms_slen;
2014 2014
2015 /* skip "%s" and white space after it */ 2015 /* skip "%s" and white space after it */
2016 s = skipwhite(cms_end + 2); 2016 s = skipwhite(cms_end + 2);
2017 cms_elen -= (int)(s - cms_end); 2017 cms_elen -= (int)(s - cms_end);
2031 if (VIM_ISDIGIT(s[len])) 2031 if (VIM_ISDIGIT(s[len]))
2032 ++len; 2032 ++len;
2033 2033
2034 /* May remove 'commentstring' start. Useful when it's a double 2034 /* May remove 'commentstring' start. Useful when it's a double
2035 * quote and we already removed a double quote. */ 2035 * quote and we already removed a double quote. */
2036 for (p = s; p > str && vim_iswhite(p[-1]); --p) 2036 for (p = s; p > str && VIM_ISWHITE(p[-1]); --p)
2037 ; 2037 ;
2038 if (p >= str + cms_slen 2038 if (p >= str + cms_slen
2039 && STRNCMP(p - cms_slen, cms_start, cms_slen) == 0) 2039 && STRNCMP(p - cms_slen, cms_start, cms_slen) == 0)
2040 { 2040 {
2041 len += (int)(s - p) + cms_slen; 2041 len += (int)(s - p) + cms_slen;
2056 did2 = TRUE; 2056 did2 = TRUE;
2057 } 2057 }
2058 } 2058 }
2059 if (len != 0) 2059 if (len != 0)
2060 { 2060 {
2061 while (vim_iswhite(s[len])) 2061 while (VIM_ISWHITE(s[len]))
2062 ++len; 2062 ++len;
2063 STRMOVE(s, s + len); 2063 STRMOVE(s, s + len);
2064 } 2064 }
2065 else 2065 else
2066 { 2066 {