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
index 3719b85b673d53bcebfa40117337e215638c2556..c7da85af452a64c015fbd04a237f65f083093c81 100644 (file)
--- 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 b7e91ae369f83e4c8bf8d57a371f85d507707e1f..caffab6bededda01b5c24c11359ba778bd812d85 100644 (file)
--- 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 a1b3718c37afcc93e3f994fa076280644ada9ed2..b09c1f7fb3b1e136bfd08af50e26e0e9105f549d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    6,
 /**/
     5,
 /**/