mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
updated for version 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)
This commit is contained in:
15
src/eval.c
15
src/eval.c
@@ -1856,8 +1856,9 @@ ex_let(eap)
|
|||||||
return;
|
return;
|
||||||
if (argend > arg && argend[-1] == '.') /* for var.='str' */
|
if (argend > arg && argend[-1] == '.') /* for var.='str' */
|
||||||
--argend;
|
--argend;
|
||||||
expr = vim_strchr(argend, '=');
|
expr = skipwhite(argend);
|
||||||
if (expr == NULL)
|
if (*expr != '=' && !(vim_strchr((char_u *)"+-.", *expr) != NULL
|
||||||
|
&& expr[1] == '='))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* ":let" without "=": list variables
|
* ":let" without "=": list variables
|
||||||
@@ -1886,12 +1887,14 @@ ex_let(eap)
|
|||||||
{
|
{
|
||||||
op[0] = '=';
|
op[0] = '=';
|
||||||
op[1] = NUL;
|
op[1] = NUL;
|
||||||
if (expr > argend)
|
if (*expr != '=')
|
||||||
{
|
{
|
||||||
if (vim_strchr((char_u *)"+-.", expr[-1]) != NULL)
|
if (vim_strchr((char_u *)"+-.", *expr) != NULL)
|
||||||
op[0] = expr[-1]; /* +=, -= or .= */
|
op[0] = *expr; /* +=, -= or .= */
|
||||||
|
expr = skipwhite(expr + 2);
|
||||||
}
|
}
|
||||||
expr = skipwhite(expr + 1);
|
else
|
||||||
|
expr = skipwhite(expr + 1);
|
||||||
|
|
||||||
if (eap->skip)
|
if (eap->skip)
|
||||||
++emsg_skip;
|
++emsg_skip;
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
Tests for autoload. vim: set ft=vim ts=8 :
|
Tests for :let. vim: set ft=vim ts=8 :
|
||||||
|
|
||||||
STARTTEST
|
STARTTEST
|
||||||
:so small.vim
|
:so small.vim
|
||||||
@@ -10,6 +10,20 @@ STARTTEST
|
|||||||
:catch
|
:catch
|
||||||
: $put ='FAIL: ' . v:exception
|
: $put ='FAIL: ' . v:exception
|
||||||
:endtry
|
: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
|
:/^Results/,$wq! test.out
|
||||||
ENDTEST
|
ENDTEST
|
||||||
|
|
||||||
|
@@ -1,2 +1,13 @@
|
|||||||
Results of test104:
|
Results of test104:
|
||||||
OK: function('tr')
|
OK: function('tr')
|
||||||
|
OK:
|
||||||
|
a #1
|
||||||
|
b #2
|
||||||
|
OK:
|
||||||
|
b #2
|
||||||
|
OK:
|
||||||
|
b #2
|
||||||
|
a #1
|
||||||
|
OK:
|
||||||
|
a #1
|
||||||
|
b #2
|
||||||
|
@@ -734,6 +734,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
229,
|
||||||
/**/
|
/**/
|
||||||
228,
|
228,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user