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)

diff --git a/src/eval.c b/src/eval.c
index baaa12f01572000baab96111cf20464df5313a4a..d9785c4a19bebbcedd9f04df5d0db41da18fc42b 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1856,8 +1856,9 @@ ex_let(eap)
        return;
     if (argend > arg && argend[-1] == '.')  /* for var.='str' */
        --argend;
-    expr = vim_strchr(argend, '=');
-    if (expr == NULL)
+    expr = skipwhite(argend);
+    if (*expr != '=' && !(vim_strchr((char_u *)"+-.", *expr) != NULL
+                         && expr[1] == '='))
     {
        /*
         * ":let" without "=": list variables
@@ -1886,12 +1887,14 @@ ex_let(eap)
     {
        op[0] = '=';
        op[1] = NUL;
-       if (expr > argend)
+       if (*expr != '=')
        {
-           if (vim_strchr((char_u *)"+-.", expr[-1]) != NULL)
-               op[0] = expr[-1];   /* +=, -= or .= */
+           if (vim_strchr((char_u *)"+-.", *expr) != NULL)
+               op[0] = *expr;   /* +=, -= or .= */
+           expr = skipwhite(expr + 2);
        }
-       expr = skipwhite(expr + 1);
+       else
+           expr = skipwhite(expr + 1);
 
        if (eap->skip)
            ++emsg_skip;

diff --git a/src/testdir/test104.in b/src/testdir/test104.in
index f329d2dbed7b24e94668d2073aedfa55c513518e..fd847131e90c26a1ebc9841d33dc8477108dbefa 100644 (file)
--- 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 5c16509af974ccf1c6384abac5c6c0a2642e2605..5fb20945c3a905d5dd78a33dcb45f61cddff0786 100644 (file)
--- 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 1c78a5e470df0a81c677b82ed5f32b9c93497dfc..2f4c89609d9fcf14bebe283d9436f1c4c21b037f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    229,
 /**/
     228,
 /**/