Mercurial > vim

comparison src/eval.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 404e98047f0b
comparison
equal deleted inserted replaced
11128:23154628ab7f 11129:f4ea50924c6d
1514 while (!ends_excmd(*arg) && !got_int) 1514 while (!ends_excmd(*arg) && !got_int)
1515 { 1515 {
1516 if (error || eap->skip) 1516 if (error || eap->skip)
1517 { 1517 {
1518 arg = find_name_end(arg, NULL, NULL, FNE_INCL_BR | FNE_CHECK_START); 1518 arg = find_name_end(arg, NULL, NULL, FNE_INCL_BR | FNE_CHECK_START);
1519 if (!vim_iswhite(*arg) && !ends_excmd(*arg)) 1519 if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg))
1520 { 1520 {
1521 emsg_severe = TRUE; 1521 emsg_severe = TRUE;
1522 EMSG(_(e_trailing)); 1522 EMSG(_(e_trailing));
1523 break; 1523 break;
1524 } 1524 }
1854 /* Find the end of the name. */ 1854 /* Find the end of the name. */
1855 p = find_name_end(name, &expr_start, &expr_end, fne_flags); 1855 p = find_name_end(name, &expr_start, &expr_end, fne_flags);
1856 if (expr_start != NULL) 1856 if (expr_start != NULL)
1857 { 1857 {
1858 /* Don't expand the name when we already know there is an error. */ 1858 /* Don't expand the name when we already know there is an error. */
1859 if (unlet && !vim_iswhite(*p) && !ends_excmd(*p) 1859 if (unlet && !VIM_ISWHITE(*p) && !ends_excmd(*p)
1860 && *p != '[' && *p != '.') 1860 && *p != '[' && *p != '.')
1861 { 1861 {
1862 EMSG(_(e_trailing)); 1862 EMSG(_(e_trailing));
1863 return NULL; 1863 return NULL;
1864 } 1864 }
2447 expr = skip_var_list(arg, &fi->fi_varcount, &fi->fi_semicolon); 2447 expr = skip_var_list(arg, &fi->fi_varcount, &fi->fi_semicolon);
2448 if (expr == NULL) 2448 if (expr == NULL)
2449 return fi; 2449 return fi;
2450 2450
2451 expr = skipwhite(expr); 2451 expr = skipwhite(expr);
2452 if (expr[0] != 'i' || expr[1] != 'n' || !vim_iswhite(expr[2])) 2452 if (expr[0] != 'i' || expr[1] != 'n' || !VIM_ISWHITE(expr[2]))
2453 { 2453 {
2454 EMSG(_("E690: Missing \"in\" after :for")); 2454 EMSG(_("E690: Missing \"in\" after :for"));
2455 return fi; 2455 return fi;
2456 } 2456 }
2457 2457
2550 /* ":let var1 var2 ...": find last space. */ 2550 /* ":let var1 var2 ...": find last space. */
2551 for (p = arg + STRLEN(arg); p >= arg; ) 2551 for (p = arg + STRLEN(arg); p >= arg; )
2552 { 2552 {
2553 xp->xp_pattern = p; 2553 xp->xp_pattern = p;
2554 MB_PTR_BACK(arg, p); 2554 MB_PTR_BACK(arg, p);
2555 if (vim_iswhite(*p)) 2555 if (VIM_ISWHITE(*p))
2556 break; 2556 break;
2557 } 2557 }
2558 return; 2558 return;
2559 } 2559 }
2560 } 2560 }
2696 /* Parse the name and find the end. */ 2696 /* Parse the name and find the end. */
2697 name_end = get_lval(arg, NULL, &lv, TRUE, eap->skip || error, 0, 2697 name_end = get_lval(arg, NULL, &lv, TRUE, eap->skip || error, 0,
2698 FNE_CHECK_START); 2698 FNE_CHECK_START);
2699 if (lv.ll_name == NULL) 2699 if (lv.ll_name == NULL)
2700 error = TRUE; /* error but continue parsing */ 2700 error = TRUE; /* error but continue parsing */
2701 if (name_end == NULL || (!vim_iswhite(*name_end) 2701 if (name_end == NULL || (!VIM_ISWHITE(*name_end)
2702 && !ends_excmd(*name_end))) 2702 && !ends_excmd(*name_end)))
2703 { 2703 {
2704 if (name_end != NULL) 2704 if (name_end != NULL)
2705 { 2705 {
2706 emsg_severe = TRUE; 2706 emsg_severe = TRUE;
6864 while (ret == OK 6864 while (ret == OK
6865 && (**arg == '[' 6865 && (**arg == '['
6866 || (**arg == '.' && rettv->v_type == VAR_DICT) 6866 || (**arg == '.' && rettv->v_type == VAR_DICT)
6867 || (**arg == '(' && (!evaluate || rettv->v_type == VAR_FUNC 6867 || (**arg == '(' && (!evaluate || rettv->v_type == VAR_FUNC
6868 || rettv->v_type == VAR_PARTIAL))) 6868 || rettv->v_type == VAR_PARTIAL)))
6869 && !vim_iswhite(*(*arg - 1))) 6869 && !VIM_ISWHITE(*(*arg - 1)))
6870 { 6870 {
6871 if (**arg == '(') 6871 if (**arg == '(')
6872 { 6872 {
6873 partial_T *pt = NULL; 6873 partial_T *pt = NULL;
6874 6874