summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-05-04 03:42:34 +0200
committerBram Moolenaar <Bram@vim.org>2013-05-04 03:42:34 +0200
commit29f49ee8d728ab77229351662b3345ed8591dd09 (patch)
treec1b2fc4d97007fb74605556faec0e80cbffa3a06
parent4e0d974645012c3fc07d1754a4729d21e49773b6 (diff)
downloadvim-git-29f49ee8d728ab77229351662b3345ed8591dd09.tar.gz
updated for version 7.3.921v7.3.921
Problem: Trying to create a fontset handle when 'guifontset' is not set. Solution: Add curly braces around the code block. (Max Kirillov)
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 8e2930cf5..4c697698c 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8082,6 +8082,7 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip, free_font)
|| do_tooltip
# endif
)
+ {
if (free_font)
gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset);
HL_TABLE()[idx].sg_fontset = fontset_name2handle(arg, 0
@@ -8092,6 +8093,7 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip, free_font)
|| do_tooltip
# endif
);
+ }
if (HL_TABLE()[idx].sg_fontset != NOFONTSET)
{
/* If it worked and it's the Normal group, use it as the normal
diff --git a/src/version.c b/src/version.c
index 0811257c4..89a6e22dc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 921,
+/**/
920,
/**/
919,