From: Kenichi Handa <handa@m17n.org>
Date: Tue, 23 May 2000 02:25:45 +0000 (+0000)
Subject: (skip_chars): Use FETCH_STRING_CHAR_ADVANCE unconditionally.
X-Git-Tag: emacs-pretest-21.0.90~3796
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1e4948d222344fc08d300536986022c7ca6aa21;p=emacs.git

(skip_chars): Use FETCH_STRING_CHAR_ADVANCE unconditionally.
---

diff --git a/src/syntax.c b/src/syntax.c
index c2711b90ef1..3be4aab4c96 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1361,15 +1361,9 @@ skip_chars (forwardp, syntaxp, string, lim)
 
   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 @@ skip_chars (forwardp, syntaxp, string, lim)
 	      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 @@ skip_chars (forwardp, syntaxp, string, lim)
 		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))
 		{