updated for version 7.2-304

diff --git a/src/ops.c b/src/ops.c
index 5d1b75f1ec579877ee4885b225b7fbf0446e0553..5b12e68dff83ab2c9e6e8b1f4a18740fd2af85bd 100644 (file)
--- 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 248fac700ebf2ceadfb7673ae96a0a1104405441..d27eeb5d0b67b5e3616c9b99aeafa6fd66594588 100644 (file)
--- 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,
 /**/