Merge pull request #1737 from fwalch/vim-7.4.541

vim-patch:7.4.541
This commit is contained in:
Justin M. Keyes 2014-12-29 23:18:13 -05:00
commit 7285b0c863
4 changed files with 8 additions and 2 deletions

View File

@ -2247,7 +2247,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, ch
int ll_n1 = lp->ll_n1;
// Check whether any of the list items is locked
for (listitem_T *ri = rettv->vval.v_list->lv_first; ri != NULL; ) {
for (listitem_T *ri = rettv->vval.v_list->lv_first; ri != NULL && ll_li != NULL; ) {
if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name)) {
return;
}

View File

@ -401,6 +401,11 @@ let l = [0, 1, 2, 3]
: $put =v:exception[:15] . v:exception[-1:-1]
:endtry
:$put =string(d)
:"
:" test for range assign
:let l = [0]
:let l[:] = [1, 2]
:$put =string(l)
:endfun
:"
:call Test(1, 2, [3, 4], {5: 6}) " This may take a while

View File

@ -129,6 +129,7 @@ caught a:000[3]
{'a': {'b': 'B'}}
Vim(call):E737: a
{'a': {'b': 'B'}}
[1, 2]
Vim(foldopen):E490:

View File

@ -197,7 +197,7 @@ static int included_patches[] = {
//544 NA
543,
//542,
//541,
541,
//540 NA
//539,
538,