updated for version 7.2-256

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 33fdaed4854b69d4367229cf8fe03ab07576d855..5281453d5bbeb5b316e9bbcb0669ca3936bcc946 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4729,6 +4729,9 @@ gui_mch_font_dialog(char_u *oldval)
     if (oldval != NULL && *oldval != NUL)
        gtk_font_selection_dialog_set_font_name(
                GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
+    else
+       gtk_font_selection_dialog_set_font_name(
+               GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
 
     if (gui.fontname)
     {
@@ -4816,6 +4819,9 @@ gui_mch_font_dialog(char_u *oldval)
        if (oldname != oldval)
            vim_free(oldname);
     }
+    else
+       gtk_font_selection_dialog_set_font_name(
+               GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
 
     response = gtk_dialog_run(GTK_DIALOG(dialog));
 

diff --git a/src/version.c b/src/version.c
index 17a4d5f8f99550f53901ad068612b020f459c1d4..d4f0b4b99bad2d6fb6ba08eea83c6066bdb15d6a 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 */
+/**/
+    256,
 /**/
     255,
 /**/