# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 959048745 0
# Node ID 4341105dc3f0b47468ba7b00a2c8c9d83e51ef5e
# Parent  a941c97dc65bcc71d74e7885a0be8dd82db9acfe
(skip_chars): Use FETCH_STRING_CHAR_ADVANCE unconditionally.

diff -r a941c97dc65b -r 4341105dc3f0 src/syntax.c
--- a/src/syntax.c	Tue May 23 02:25:11 2000 +0000
+++ b/src/syntax.c	Tue May 23 02:25:45 2000 +0000
@@ -1361,15 +1361,9 @@
 
   while (i_byte < size_byte)
     {
-      int c_leading_code;
+      int c_leading_code = XSTRING (string)->data[i_byte];
 
-      if (string_multibyte)
-	{
-	  c_leading_code = XSTRING (string)->data[i_byte];
-	  FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
-	}
-      else
-	c = c_leading_code = XSTRING (string)->data[i_byte++];
+      FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
 
       /* Convert multibyteness between what the string has
 	 and what the buffer has.  */
@@ -1387,13 +1381,8 @@
 	      if (i_byte == size_byte)
 		break;
 
-	      if (string_multibyte)
-		{
-		  c_leading_code = XSTRING (string)->data[i_byte];
-		  FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
-		}
-	      else
-		c = c_leading_code = XSTRING (string)->data[i_byte++];
+	      c_leading_code = XSTRING (string)->data[i_byte];
+	      FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
 	    }
 	  if (i_byte < size_byte
 	      && XSTRING (string)->data[i_byte] == '-')
@@ -1407,13 +1396,8 @@
 		break;
 
 	      /* Get the end of the range.  */
-	      if (string_multibyte)
-		{
-		  c2_leading_code = XSTRING (string)->data[i_byte];
-		  FETCH_STRING_CHAR_ADVANCE (c2, string, i, i_byte);
-		}
-	      else
-		c2 = XSTRING (string)->data[i_byte++];
+	      c2_leading_code = XSTRING (string)->data[i_byte];
+	      FETCH_STRING_CHAR_ADVANCE (c2, string, i, i_byte);
 
 	      if (SINGLE_BYTE_CHAR_P (c))
 		{