aboutsummaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2014-04-14 13:36:58 +0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-16 09:32:50 -0300
commitd322be894e532e9148979ab10f3e277f1f359eb1 (patch)
tree16b92a8b8fc0b8ac20d74c1626521a85817d24d4 /src/eval.c
parenta129ab20e736dd5ec33156a713c325e825547cbb (diff)
downloadrneovim-d322be894e532e9148979ab10f3e277f1f359eb1.tar.gz
rneovim-d322be894e532e9148979ab10f3e277f1f359eb1.tar.bz2
rneovim-d322be894e532e9148979ab10f3e277f1f359eb1.zip
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
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c20
1 files changed, 11 insertions, 9 deletions
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;