summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2010-09-18 13:36:49 +0200
committerBram Moolenaar <bram@vim.org>2010-09-18 13:36:49 +0200
commit35a762604a0be63f4277ecc12766215e0569ed91 (patch)
tree6f4c510222e635c5f841bc6cb9e61af472723baa
parent20f9f0af655e370c1d4d8fdac1d73d6b3256b79e (diff)
downloadvim-35a762604a0be63f4277ecc12766215e0569ed91.tar.gz
updated for version 7.3.006v7.3.006v7-3-006
Problem: Can't build some multi-byte code with C89. Solution: Move code to after declarations. (Joachim Schmitz)
-rw-r--r--src/mbyte.c16
-rw-r--r--src/spell.c2
-rw-r--r--src/version.c2
3 files changed, 11 insertions, 9 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 3719b85b..c7da85af 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5167,16 +5167,16 @@ im_set_position(row, col)
void
xim_set_preedit()
{
- if (xic == NULL)
- return;
-
- xim_set_focus(TRUE);
-
XVaNestedList attr_list;
XRectangle spot_area;
XPoint over_spot;
int line_space;
+ if (xic == NULL)
+ return;
+
+ xim_set_focus(TRUE);
+
if (!xim_has_focus)
{
/* hide XIM cursor */
@@ -5554,12 +5554,12 @@ im_get_status()
void
xim_set_status_area()
{
- if (xic == NULL)
- return;
-
XVaNestedList preedit_list = 0, status_list = 0, list = 0;
XRectangle pre_area, status_area;
+ if (xic == NULL)
+ return;
+
if (input_style & XIMStatusArea)
{
if (input_style & XIMPreeditArea)
diff --git a/src/spell.c b/src/spell.c
index b7e91ae3..caffab6b 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -4679,7 +4679,7 @@ spell_free_all()
buf_T *buf;
char_u fname[MAXPATHL];
- /* Go through all buffers and handle 'spelllang'. */ //<VN>
+ /* Go through all buffers and handle 'spelllang'. <VN> */
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
ga_clear(&buf->b_s.b_langp);
diff --git a/src/version.c b/src/version.c
index a1b3718c..b09c1f7f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 6,
+/**/
5,
/**/
4,