patch 7.4.1181

Problem:    free_tv() can't handle special variables. (Damien)
Solution:   Add the variable type.

diff --git a/src/eval.c b/src/eval.c
index 590834fe4a87684a9d0afccb972c393cd099713b..5f05c3de90e3ee1da8a8ebe073d6edbc936a390f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -21608,6 +21608,7 @@ free_tv(varp)
            case VAR_FLOAT:
 #endif
            case VAR_UNKNOWN:
+           case VAR_SPECIAL:
                break;
            default:
                EMSG2(_(e_intern2), "free_tv()");

diff --git a/src/testdir/test_viml.vim b/src/testdir/test_viml.vim
index 3c140c84d73f73066f7ff95a1f53d971e8aa4e14..f7b34146ac88a9fa79b545ecc465ec7d8d68a4ff 100644 (file)
--- a/src/testdir/test_viml.vim
+++ b/src/testdir/test_viml.vim
@@ -1005,6 +1005,16 @@ func Test_type()
     call assert_false(empty(v:true))
     call assert_true(empty(v:null))
     call assert_true(empty(v:none))
+
+    func ChangeYourMind()
+      try
+       return v:true
+      finally
+        return 'something else'
+      endtry
+    endfunc
+
+    call ChangeYourMind()
 endfunc
 
 "-------------------------------------------------------------------------------

diff --git a/src/version.c b/src/version.c
index ee6ac48c4b33d38d1c8c223b1e6ff314cb9453bd..53f5dedb46a1f002d4a3c7b1e6e73edb93c5e0d3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1181,
 /**/
     1180,
 /**/