# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1031026129 0
# Node ID 288b118954cadac04b33ef5b9f0f4c4d0054fdb3
# Parent  c58aec54e4fb038a4cbfd69e0eefaa3db42626c8
(Fminibuffer_complete_word): Use the macro
FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.

diff -r c58aec54e4fb -r 288b118954ca src/minibuf.c
--- a/src/minibuf.c	Tue Sep 03 04:08:33 2002 +0000
+++ b/src/minibuf.c	Tue Sep 03 04:08:49 2002 +0000
@@ -1967,22 +1967,14 @@
 
   /* Now find first word-break in the stuff found by completion.
      i gets index in string of where to stop completing.  */
-  {
-    int len, c;
-    completion_string = XSTRING (completion)->data;
-    for (; i_byte < STRING_BYTES (XSTRING (completion)); i_byte += len, i++)
-      {
-	c = STRING_CHAR_AND_LENGTH (completion_string + i_byte,
-				    bytes - i_byte,
-				    len);
-	if (SYNTAX (c) != Sword)
-	  {
-	    i_byte += len;
-	    i++;
-	    break;
-	  }
-      }
-  }
+  while (i_byte < STRING_BYTES (XSTRING (completion)))
+    {
+      int c;
+
+      FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE (c, completion, i, i_byte);
+      if (SYNTAX (c) != Sword)
+	break;
+    }
 
   /* If got no characters, print help for user.  */