From: Bram Moolenaar Date: Sat, 22 Jun 2013 11:00:16 +0000 (+0200) Subject: updated for version 7.3.1225 X-Git-Tag: v7.3.1225 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dbcd0c7ad93533f46981ebafe6710c1e03b1be2;p=vim updated for version 7.3.1225 Problem: Compiler warnings when building with Motif. Solution: Change set_label() argument. (Kazunobu Kuriyama) --- diff --git a/src/gui_motif.c b/src/gui_motif.c index 5b6c7a764..57f264df9 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 1bc2bae5d..4d2e7a962 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1225, /**/ 1224, /**/