From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 11 Sep 2009 13:46:41 +0000 (+0000)
Subject: updated for version 7.2-256
X-Git-Tag: v7.2.256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bef9d835f5642e535ed79f353b4559faa0d8a198;p=vim

updated for version 7.2-256
---

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 33fdaed48..5281453d5 100644
--- 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 17a4d5f8f..d4f0b4b99 100644
--- 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,
 /**/