From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Nov 2009 11:38:30 +0000 (+0000)
Subject: updated for version 7.2-304
X-Git-Tag: v7.2.304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=331dafdbb852fa13837b7399f5fb2dcb7e1fb9fe;p=vim

updated for version 7.2-304
---

diff --git a/src/ops.c b/src/ops.c
index 5d1b75f1e..5b12e68df 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5597,7 +5597,10 @@ x11_export_final_selection()
 	    vc.vc_type = CONV_NONE;
 	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
 	    {
-		conv_str = string_convert(&vc, str, (int*)&len);
+	        int intlen = len;
+
+		conv_str = string_convert(&vc, str, &intlen);
+		len = intlen;
 		if (conv_str != NULL)
 		{
 		    vim_free(str);
diff --git a/src/version.c b/src/version.c
index 248fac700..d27eeb5d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    304,
 /**/
     303,
 /**/