diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-08-29 09:46:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-08-29 09:46:10 +0200 |
| commit | f2d912e8bc64927f9089e5da9185b9f108d28c0d (patch) | |
| tree | 6b5fbe70727e536673d36bd7df71c63d366219f5 /src/eval.c | |
| parent | 26f08b06b681085e8f40b109871fe7ae2f3bd7c6 (diff) | |
| download | vim-git-f2d912e8bc64927f9089e5da9185b9f108d28c0d.tar.gz | |
updated for version 7.4.419v7.4.419
Problem: Whan part of a list is locked it's possible to make changes.
Solution: Check if any of the list items is locked before make a change.
(ZyX)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 654e4187d..a8e94639d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2945,6 +2945,23 @@ set_var_lval(lp, endp, rettv, copy, op) ; 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 (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. */ @@ -3646,6 +3663,17 @@ do_unlet_var(lp, name_end, forceit) 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 FAIL; + 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)) |