0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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)
This commit is contained in:
Bram Moolenaar
2017-10-02 19:29:48 +02:00
parent 712549e04e
commit 2a6a6c3014
3 changed files with 19 additions and 0 deletions

View File

@@ -1704,7 +1704,10 @@ ex_let_one(
&stringval, opt_flags); &stringval, opt_flags);
if ((opt_type == 1 && *op == '.') if ((opt_type == 1 && *op == '.')
|| (opt_type == 0 && *op != '.')) || (opt_type == 0 && *op != '.'))
{
EMSG2(_(e_letwrong), op); EMSG2(_(e_letwrong), op);
s = NULL; /* don't set the value */
}
else else
{ {
if (opt_type == 1) /* number */ if (opt_type == 1) /* number */

View File

@@ -29,3 +29,17 @@ func Test_let_termcap()
let &t_xx = "" let &t_xx = ""
call assert_fails('let x = &t_xx', 'E15') call assert_fails('let x = &t_xx', 'E15')
endfunc 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

View File

@@ -761,6 +761,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 */
/**/
1172,
/**/ /**/
1171, 1171,
/**/ /**/