diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-09-11 13:46:41 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-09-11 13:46:41 +0000 |
commit | bef9d835f5642e535ed79f353b4559faa0d8a198 (patch) | |
tree | fc1c92efa83fd4e2d7b3b50e6048f1a4dc99c2a2 | |
parent | 319bdbd5ef1de87fac5e7725d17ba411c5537c5a (diff) |
updated for version 7.2-256v7.2.256
-rw-r--r-- | src/gui_gtk_x11.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 33fdaed485..5281453d5b 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 17a4d5f8f9..d4f0b4b99b 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 256, +/**/ 255, /**/ 254, |