From: Kenichi Handa <handa@m17n.org>
Date: Fri, 3 Sep 1999 01:28:42 +0000 (+0000)
Subject: (print_string): Use the macro STRING_CHAR_AND_LENGTH.
X-Git-Tag: emacs-pretest-21.0.90~6940
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=765fe1d0fac970c0354d8bd0c79605e8bb307850;p=emacs.git

(print_string): Use the macro STRING_CHAR_AND_LENGTH.
(print): Likewise.
---

diff --git a/src/print.c b/src/print.c
index ecd146808ed..39e450dc0ed 100644
--- a/src/print.c
+++ b/src/print.c
@@ -498,8 +498,8 @@ print_string (string, printcharfun)
 	    /* 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 @@ print (obj, printcharfun, escapeflag)
 
 	      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