From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 14 Oct 2012 01:41:59 +0000 (+0200)
Subject: updated for version 7.3.689
X-Git-Tag: v7.3.689
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d04da7cb4afe77de05e4e08e7e86e504be6759e0;p=thirdparty%2Fvim.git

updated for version 7.3.689
Problem:    MzScheme and Lua may use a NULL string.
Solution:   Use an empty string instead of NULL. (Yukihiro Nakadaira)
---

diff --git a/src/if_lua.c b/src/if_lua.c
index e873b6bf77..ce65fd2f68 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -464,7 +464,8 @@ luaV_pushtypval(lua_State *L, typval_T *tv)
     switch (tv->v_type)
     {
 	case VAR_STRING:
-	    lua_pushstring(L, (char *) tv->vval.v_string);
+	    lua_pushstring(L, tv->vval.v_string == NULL
+					    ? "" : (char *)tv->vval.v_string);
 	    break;
 	case VAR_NUMBER:
 	    lua_pushinteger(L, (int) tv->vval.v_number);
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 86e96bd335..d6ee4b9c5a 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -2649,7 +2649,8 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 	new_value = FALSE;
     else if (vim_value->v_type == VAR_STRING)
     {
-	result = scheme_make_string((char *)vim_value->vval.v_string);
+	result = scheme_make_string(vim_value->vval.v_string == NULL
+				    ? "" : (char *)vim_value->vval.v_string);
 	MZ_GC_CHECK();
     }
     else if (vim_value->v_type == VAR_NUMBER)
diff --git a/src/version.c b/src/version.c
index d512955fab..0ea098b92e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    689,
 /**/
     688,
 /**/