From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Mon, 22 Mar 2010 02:05:10 +0000 (+0000)
Subject: Merged from the latest developing branch.
X-Git-Url: https://repo.or.cz/w/MacVim.git/commitdiff_plain/d61270115bca22bc1facb67666380ff86c8767d5

Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1817 2a77ed30-b011-0410-a7ad-c7884a0aa172
---

diff --git a/src/if_ruby.c b/src/if_ruby.c
index 41cb7917..2ee329bc 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -722,8 +722,8 @@ static VALUE vim_to_ruby(typval_T *tv)
 
     if (tv->v_type == VAR_STRING)
     {
-	result = rb_str_new2((char *)(tv->vval.v_string == NULL
-						   ? "" : tv->vval.v_string));
+	result = rb_str_new2(tv->vval.v_string == NULL
+					  ? "" : (char *)(tv->vval.v_string));
     }
     else if (tv->v_type == VAR_NUMBER)
     {
diff --git a/src/version.c b/src/version.c
index c625dffa..12174c7a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    403,
+/**/
     402,
 /**/
     401,