Merge pull request #1320 from splinterofchaos/ll-lock

vim-patch:7.4.419

4 files changed, 48 insertions, 1 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)) {
diff --git a/src/nvim/testdir/test55.in b/src/nvim/testdir/test55.in
index 8e073f30f2..140cb7c0e5 100644
--- a/src/nvim/testdir/test55.in
+++ b/src/nvim/testdir/test55.in
@@ -282,6 +282,21 @@ let l = [0, 1, 2, 3]
 :    $put =ps
 :  endfor
 :endfor
+:unlet l
+:let l = [1, 2, 3, 4]
+:lockvar! l
+:$put =string(l)
+:unlockvar l[1]
+:unlet l[0:1]
+:$put =string(l)
+:unlet l[1:2]
+:$put =string(l)
+:unlockvar l[1]
+:let l[0:1] = [0, 1]
+:$put =string(l)
+:let l[1:2] = [0, 1]
+:$put =string(l)
+:unlet l
 :" :lockvar/islocked() triggering script autoloading
 :set rtp+=./sautest
 :lockvar g:footest#x
diff --git a/src/nvim/testdir/test55.ok b/src/nvim/testdir/test55.ok
index dfd8060db7..e8560de401 100644
--- a/src/nvim/testdir/test55.ok
+++ b/src/nvim/testdir/test55.ok
@@ -86,6 +86,11 @@ FFFFFFF
 FFpFFpp
 0000-000
 ppppppp
+[1, 2, 3, 4]
+[1, 2, 3, 4]
+[1, 2, 3, 4]
+[1, 2, 3, 4]
+[1, 2, 3, 4]
 locked g:footest#x:-1
 exists g:footest#x:0
 g:footest#x: 1
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9b5b995801..5b30dd3de7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -246,7 +246,7 @@ static int included_patches[] = {
   //422,
   //421,
   //420 NA
-  //419,
+  419,
   418,
   //417,
   //416,