summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-03 21:11:39 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-03 21:11:39 +0200
commitcdffbeae2b031160a479f24cfedacab926938e5d (patch)
treefb2bdace2c6d396aebbe39633655a8aa82676125
parent95a513511835b017479a513664eeed6d8899fa0d (diff)
downloadvim-git-cdffbeae2b031160a479f24cfedacab926938e5d.tar.gz
updated for version 7.3.876v7.3.876
Problem: #if indents are off. Solution: Insert a space where appropriate. (Taro Muraoka)
-rw-r--r--src/gui.c8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui.c b/src/gui.c
index 6e5d58b5c..1c60b7a60 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -991,7 +991,7 @@ gui_get_wide_font()
}
gui_mch_free_font(gui.wide_font);
-#ifdef FEAT_GUI_GTK
+# ifdef FEAT_GUI_GTK
/* Avoid unnecessary overhead if 'guifontwide' is equal to 'guifont'. */
if (font != NOFONT && gui.norm_font != NOFONT
&& pango_font_description_equal(font, gui.norm_font))
@@ -1000,11 +1000,11 @@ gui_get_wide_font()
gui_mch_free_font(font);
}
else
-#endif
+# endif
gui.wide_font = font;
-#ifdef FEAT_GUI_MSWIN
+# ifdef FEAT_GUI_MSWIN
gui_mch_wide_font_changed();
-#endif
+# endif
return OK;
}
#endif
diff --git a/src/version.c b/src/version.c
index f0d5e00de..a68eb13d5 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 */
/**/
+ 876,
+/**/
875,
/**/
874,