Merged from the latest developing branch.
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Mon, 22 Mar 2010 02:05:10 +0000 (22 02:05 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Mon, 22 Mar 2010 02:05:10 +0000 (22 02:05 +0000)
git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1817 2a77ed30-b011-0410-a7ad-c7884a0aa172

src/if_ruby.c
src/version.c

index 41cb791..2ee329b 100644 (file)
@@ -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)
     {
index c625dff..12174c7 100644 (file)
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    403,
+/**/
     402,
 /**/
     401,