summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ops.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
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
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 304,
+/**/
303,
/**/
302,