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

@@ -1751,11 +1751,10 @@ void ex_let(exarg_T *eap)
     return;
   if (argend > arg && argend[-1] == '.')    /* for var.='str' */
     --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
-     */
     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 (*expr != '=') {
-      if (vim_strchr((char_u *)"+-.", expr[-1]) != NULL)
+      if (vim_strchr((char_u *)"+-.", *expr) != NULL) {
-        op[0] = expr[-1];           /* +=, -= or .= */
+        op[0] = *expr;  // +=, -=, .=
+      }
+      expr = skipwhite(expr + 2);
+    } else {
+      expr = skipwhite(expr + 1);
     }
-    expr = skipwhite(expr + 1);
 
     if (eap->skip)
       ++emsg_skip;

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
 

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

src/version.c

@@ -232,7 +232,7 @@ static int included_patches[] = {
   //232,
   //231,
   //230,
-  //229,
+  229,
   //228,
   //227,
   //226,