summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-22 13:00:16 +0200
committerBram Moolenaar <bram@vim.org>2013-06-22 13:00:16 +0200
commitd970237860788a8c0184c3e84f41dacc446f8a59 (patch)
treebf16a872cf39c72f6884bd3cbf75e7971148e694
parentf07ec2703a654ed53254df8a9aecf842a20e8600 (diff)
downloadvim-d970237860788a8c0184c3e84f41dacc446f8a59.tar.gz
updated for version 7.3.1225v7.3.1225v7-3-1225
Problem: Compiler warnings when building with Motif. Solution: Change set_label() argument. (Kazunobu Kuriyama)
-rw-r--r--src/gui_motif.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 5b6c7a76..57f264df 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -3653,7 +3653,7 @@ find_replace_keypress(w, frdp, event)
static void
set_label(w, label)
Widget w;
- char_u *label;
+ char *label;
{
XmString str;
char_u *p, *next;
@@ -3662,7 +3662,7 @@ set_label(w, label)
if (!w)
return;
- p = vim_strsave(label);
+ p = vim_strsave((char_u *)label);
if (p == NULL)
return;
for (next = p; *next; ++next)
diff --git a/src/version.c b/src/version.c
index 1bc2bae5..4d2e7a96 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1225,
+/**/
1224,
/**/
1223,