# HG changeset patch # User Bram Moolenaar # Date 1284809809 -7200 # Node ID 06aa43dde5610dff598940ccde1dd25a617a1a52 # Parent 1c00ea3641a8a1e58e70cd51ab831003bdb41d50 updated for version 7.3.006 Problem: Can't build some multi-byte code with C89. Solution: Move code to after declarations. (Joachim Schmitz) diff --git a/src/mbyte.c b/src/mbyte.c --- a/src/mbyte.c +++ b/src/mbyte.c @@ -5167,16 +5167,16 @@ im_set_position(row, col) void xim_set_preedit() { + XVaNestedList attr_list; + XRectangle spot_area; + XPoint over_spot; + int line_space; + if (xic == NULL) return; xim_set_focus(TRUE); - XVaNestedList attr_list; - XRectangle spot_area; - XPoint over_spot; - int line_space; - if (!xim_has_focus) { /* hide XIM cursor */ @@ -5554,12 +5554,12 @@ im_get_status() void xim_set_status_area() { + XVaNestedList preedit_list = 0, status_list = 0, list = 0; + XRectangle pre_area, status_area; + if (xic == NULL) return; - XVaNestedList preedit_list = 0, status_list = 0, list = 0; - XRectangle pre_area, status_area; - if (input_style & XIMStatusArea) { if (input_style & XIMPreeditArea) diff --git a/src/spell.c b/src/spell.c --- 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'. */ // + /* Go through all buffers and handle 'spelllang'. */ 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 --- 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,