diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-11 23:04:09 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-11 23:04:09 -0500 |
| commit | 8da78bc3ae694aa2a6edaac97756211374491471 (patch) | |
| tree | e4334d73a765a2d0266c22de2daa39f5d54bd2c8 /src/nvim/eval.c | |
| parent | b1e06c6d60f4947794851982eb73db6ef3b64fbf (diff) | |
| parent | 96be11f609fbdfff64472dc0bf8a4f4528cf4f95 (diff) | |
| download | rneovim-8da78bc3ae694aa2a6edaac97756211374491471.tar.gz rneovim-8da78bc3ae694aa2a6edaac97756211374491471.tar.bz2 rneovim-8da78bc3ae694aa2a6edaac97756211374491471.zip | |
Merge pull request #1320 from splinterofchaos/ll-lock
vim-patch:7.4.419
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index fc61fed529..8e97d8bdd9 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2241,6 +2241,22 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, ch : lp->ll_tv->vval.v_dict->dv_lock, lp->ll_name)) ; else if (lp->ll_range) { + listitem_T *ll_li = lp->ll_li; + 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; ) { + if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name)) { + return; + } + ri = ri->li_next; + if (ri == NULL || (!lp->ll_empty2 && lp->ll_n2 == ll_n1)) { + break; + } + ll_li = ll_li->li_next; + ll_n1++; + } + /* * Assign the List values to the list items. */ @@ -2804,6 +2820,17 @@ static int do_unlet_var(lval_T *lp, char_u *name_end, int forceit) return FAIL; else if (lp->ll_range) { listitem_T *li; + listitem_T *ll_li = lp->ll_li; + int ll_n1 = lp->ll_n1; + + while (ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= ll_n1)) { + li = ll_li->li_next; + if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name)) { + return false; + } + ll_li = li; + ll_n1++; + } /* Delete a range of List items. */ while (lp->ll_li != NULL && (lp->ll_empty2 || lp->ll_n2 >= lp->ll_n1)) { |