updated for version 7.2a-012

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index d01a831b550a8d59f9521c7199b0f38e3cc25b64..741b733d747d932838b525fa4f426a81f041ef1a 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3166,7 +3166,7 @@ add_tabline_menu_item(GtkWidget *menu, char_u *text, int resp)
     gtk_container_add(GTK_CONTAINER(menu), item);
     gtk_signal_connect(GTK_OBJECT(item), "activate",
            GTK_SIGNAL_FUNC(tabline_menu_handler),
-           (gpointer)resp);
+           (gpointer)(long)resp);
 }
 
 /*
@@ -3354,7 +3354,8 @@ gui_mch_update_tabline(void)
        }
 
        event_box = gtk_notebook_get_tab_label(GTK_NOTEBOOK(gui.tabline), page);
-       gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)tab_num);
+       gtk_object_set_user_data(GTK_OBJECT(event_box),
+                                                    (gpointer)(long)tab_num);
        label = GTK_BIN(event_box)->child;
        get_tabline_label(tp, FALSE);
        labeltext = CONVERT_TO_UTF8(NameBuff);
@@ -3711,7 +3712,7 @@ gui_mch_init(void)
        gtk_widget_show(label);
        event_box = gtk_event_box_new();
        gtk_widget_show(event_box);
-       gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)1);
+       gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)1L);
        gtk_misc_set_padding(GTK_MISC(label), 2, 2);
        gtk_container_add(GTK_CONTAINER(event_box), label);
        gtk_notebook_set_tab_label(GTK_NOTEBOOK(gui.tabline), page, event_box);

diff --git a/src/version.c b/src/version.c
index cd69cfc0229d5687957f81a69ff446cc3d2dfa03..f46ebda2c56762368a5f06309baed0dc26a5bf0c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    12,
 /**/
     11,
 /**/