From d322be894e532e9148979ab10f3e277f1f359eb1 Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Mon, 14 Apr 2014 13:36:58 +0200 Subject: vim-patch:7.4.229 Problem: Using ":let" for listing variables and the second one is a curly braces expression may fail. Solution: Check for an "=" in a better way. (ZyX) https://code.google.com/p/vim/source/detail?r=839cca5ec18d560e3714065e54ed38b6e812aaf7 --- src/eval.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/eval.c') diff --git a/src/eval.c b/src/eval.c index fa5a920939..adb47d38b7 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1751,11 +1751,10 @@ void ex_let(exarg_T *eap) return; if (argend > arg && argend[-1] == '.') /* for var.='str' */ --argend; - expr = vim_strchr(argend, '='); - if (expr == NULL) { - /* - * ":let" without "=": list variables - */ + expr = skipwhite(argend); + if (*expr != '=' && !(vim_strchr((char_u *)"+-.", *expr) != NULL + && expr[1] == '=')) { + // ":let" without "=": list variables if (*arg == '[') EMSG(_(e_invarg)); else if (!ends_excmd(*arg)) @@ -1775,11 +1774,14 @@ void ex_let(exarg_T *eap) } else { op[0] = '='; op[1] = NUL; - if (expr > argend) { - if (vim_strchr((char_u *)"+-.", expr[-1]) != NULL) - op[0] = expr[-1]; /* +=, -= or .= */ + if (*expr != '=') { + if (vim_strchr((char_u *)"+-.", *expr) != NULL) { + op[0] = *expr; // +=, -=, .= + } + expr = skipwhite(expr + 2); + } else { + expr = skipwhite(expr + 1); } - expr = skipwhite(expr + 1); if (eap->skip) ++emsg_skip; -- cgit