# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 936322122 0
# Node ID 4a69654961a6b3cf67fbc7975b468270987accae
# Parent  9392c9b7dd07ef783e3ca293bdd4cc128bdc75d1
(print_string): Use the macro STRING_CHAR_AND_LENGTH.
(print): Likewise.

diff -r 9392c9b7dd07 -r 4a69654961a6 src/print.c
--- a/src/print.c	Fri Sep 03 01:28:42 1999 +0000
+++ b/src/print.c	Fri Sep 03 01:28:42 1999 +0000
@@ -498,8 +498,8 @@
 	    /* Here, we must convert each multi-byte form to the
 	       corresponding character code before handing it to PRINTCHAR.  */
 	    int len;
-	    int ch = STRING_CHAR_AND_CHAR_LENGTH (XSTRING (string)->data + i,
-						  size_byte - i, len);
+	    int ch = STRING_CHAR_AND_LENGTH (XSTRING (string)->data + i,
+					     size_byte - i, len);
 	    if (!CHAR_VALID_P (ch, 0))
 	      {
 		ch = XSTRING (string)->data[i];
@@ -1141,8 +1141,8 @@
 
 	      if (STRING_MULTIBYTE (obj))
 		{
-		  c = STRING_CHAR_AND_CHAR_LENGTH (str + i_byte,
-						   size_byte - i_byte, len);
+		  c = STRING_CHAR_AND_LENGTH (str + i_byte,
+					      size_byte - i_byte, len);
 		  if (CHAR_VALID_P (c, 0))
 		    i_byte += len;
 		  else