diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-11-25 11:38:30 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-11-25 11:38:30 +0000 |
commit | 331dafdbb852fa13837b7399f5fb2dcb7e1fb9fe (patch) | |
tree | d36c344f0160f480c833a1ced53a767b0c0ada8b | |
parent | 4592dee5765e9d1ef542d9252b7e9a3640800cba (diff) |
updated for version 7.2-304v7.2.304
-rw-r--r-- | src/ops.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 248fac700e..d27eeb5d0b 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, |