From 1e6fa9338e58a3ed9f014ffea4ed52df78f1258b Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Fri, 20 May 2016 23:17:41 -0700
Subject: vim-patch:7.4.1068

Problem:    Wrong way to check for unletting internal variables.
Solution:   Use a better way. (Olaf Dabrunz)

https://github.com/vim/vim/commit/71bcfdf30109c3d6e40d143adcaf33964b18a70b
---
 src/nvim/eval.c    | 27 +++++++++++++++++----------
 src/nvim/version.c |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 425c3d3ed5..e60bca10f3 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2973,23 +2973,30 @@ int do_unlet(char_u *name, int forceit)
   ht = find_var_ht_dict(name, &varname, &dict);
 
   if (ht != NULL && *varname != NUL) {
+    if (ht == &globvarht) {
+      d = &globvardict;
+    } else if (current_funccal != NULL
+               && ht == &current_funccal->l_vars.dv_hashtab) {
+      d = &current_funccal->l_vars;
+    } else if (ht == &compat_hashtab) {
+        d = &vimvardict;
+    } else {
+      di = find_var_in_ht(ht, *name, (char_u *)"", false);
+      d = di->di_tv.vval.v_dict;
+    }
+    if (d == NULL) {
+      EMSG2(_(e_intern2), "do_unlet()");
+      return FAIL;
+    }
     hi = hash_find(ht, varname);
     if (!HASHITEM_EMPTY(hi)) {
       di = HI2DI(hi);
       if (var_check_fixed(di->di_flags, name, false)
-          || var_check_ro(di->di_flags, name, false)) {
+          || var_check_ro(di->di_flags, name, false)
+          || tv_check_lock(d->dv_lock, name, false)) {
         return FAIL;
       }
 
-      if (ht == &globvarht) {
-        d = &globvardict;
-      } else if (current_funccal != NULL
-                 && ht == &current_funccal->l_vars.dv_hashtab) {
-        d = &current_funccal->l_vars;
-      } else {
-        di = find_var_in_ht(ht, *name, (char_u *)"", false);
-        d = di->di_tv.vval.v_dict;
-      }
       if (d == NULL || tv_check_lock(d->dv_lock, name, false)) {
         return FAIL;
       }
diff --git a/src/nvim/version.c b/src/nvim/version.c
index e4b4f11c09..45695177a2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -625,7 +625,7 @@ static int included_patches[] = {
   1071,
   // 1070 NA
   // 1069 NA
-  // 1068,
+  1068,
   // 1067 NA
   // 1066 NA
   1065,
-- 
cgit