From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 2 Oct 2017 17:29:48 +0000 (+0200)
Subject: patch 8.0.1172: when E734 is given option is still set
X-Git-Tag: v8.0.1172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a6a6c3014e728cd01c750b0f60484d4eaf22a8c;p=vim

patch 8.0.1172: when E734 is given option is still set

Problem:    When E734 is given option is still set.
Solution:   Assign NULL to "s". (Christian Brabandt)
---

diff --git a/src/eval.c b/src/eval.c
index 8b1ceaea8..8670e1240 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1704,7 +1704,10 @@ ex_let_one(
 						       &stringval, opt_flags);
 		if ((opt_type == 1 && *op == '.')
 			|| (opt_type == 0 && *op != '.'))
+		{
 		    EMSG2(_(e_letwrong), op);
+		    s = NULL;  /* don't set the value */
+		}
 		else
 		{
 		    if (opt_type == 1)  /* number */
diff --git a/src/testdir/test_assign.vim b/src/testdir/test_assign.vim
index efc9d086b..317d45867 100644
--- a/src/testdir/test_assign.vim
+++ b/src/testdir/test_assign.vim
@@ -29,3 +29,17 @@ func Test_let_termcap()
   let &t_xx = ""
   call assert_fails('let x = &t_xx', 'E15')
 endfunc
+
+func Test_let_option_error()
+  let _w = &tw
+  let &tw = 80
+  call assert_fails('let &tw .= 1', 'E734')
+  call assert_equal(80, &tw)
+  let &tw = _w
+
+  let _w = &fillchars
+  let &fillchars = "vert:|"
+  call assert_fails('let &fillchars += "diff:-"', 'E734')
+  call assert_equal("vert:|", &fillchars)
+  let &fillchars = _w
+endfunc
diff --git a/src/version.c b/src/version.c
index 925a6cd61..6e3f90a37 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1172,
 /**/
     1171,
 /**/