diff options
| author | Marco Hinz <mh.codebro@gmail.com> | 2014-04-14 13:36:58 +0200 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-16 09:32:50 -0300 |
| commit | d322be894e532e9148979ab10f3e277f1f359eb1 (patch) | |
| tree | 16b92a8b8fc0b8ac20d74c1626521a85817d24d4 /src | |
| parent | a129ab20e736dd5ec33156a713c325e825547cbb (diff) | |
| download | rneovim-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')
| -rw-r--r-- | src/eval.c | 20 | ||||
| -rw-r--r-- | src/testdir/test104.in | 16 | ||||
| -rw-r--r-- | src/testdir/test104.ok | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 38 insertions, 11 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; diff --git a/src/testdir/test104.in b/src/testdir/test104.in index f329d2dbed..fd847131e9 100644 --- a/src/testdir/test104.in +++ b/src/testdir/test104.in @@ -1,4 +1,4 @@ -Tests for autoload. vim: set ft=vim ts=8 : +Tests for :let. vim: set ft=vim ts=8 : STARTTEST :so small.vim @@ -10,6 +10,20 @@ STARTTEST :catch : $put ='FAIL: ' . v:exception :endtry +:let a = 1 +:let b = 2 +:for letargs in ['a b', '{0 == 1 ? "a" : "b"}', '{0 == 1 ? "a" : "b"} a', 'a {0 == 1 ? "a" : "b"}'] +: try +: redir => messages +: execute 'let' letargs +: redir END +: $put ='OK:' +: $put =split(substitute(messages, '\n', '\0 ', 'g'), '\n') +: catch +: $put ='FAIL: ' . v:exception +: redir END +: endtry +:endfor :/^Results/,$wq! test.out ENDTEST diff --git a/src/testdir/test104.ok b/src/testdir/test104.ok index 5c16509af9..5fb20945c3 100644 --- a/src/testdir/test104.ok +++ b/src/testdir/test104.ok @@ -1,2 +1,13 @@ Results of test104: OK: function('tr') +OK: + a #1 + b #2 +OK: + b #2 +OK: + b #2 + a #1 +OK: + a #1 + b #2 diff --git a/src/version.c b/src/version.c index 6dfc371f4a..4955dea885 100644 --- a/src/version.c +++ b/src/version.c @@ -232,7 +232,7 @@ static int included_patches[] = { //232, //231, //230, - //229, + 229, //228, //227, //226, |