From da1ad4e741771618cc1ec4c4952c46db04924f4f Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Wed, 4 Nov 1998 10:53:14 +0000
Subject: [PATCH] (print_string): Check validity of a character. (print):
 Likewise.

---
 src/print.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/print.c b/src/print.c
index ec340e2c91d..3723c79b6dd 100644
--- a/src/print.c
+++ b/src/print.c
@@ -635,7 +635,11 @@ print_string (string, printcharfun)
 	    int len;
 	    int ch = STRING_CHAR_AND_CHAR_LENGTH (XSTRING (string)->data + i,
 						  size_byte - i, len);
-
+	    if (!CHAR_VALID_P (ch, 0))
+	      {
+		ch = XSTRING (string)->data[i];
+		len = 1;
+	      }
 	    PRINTCHAR (ch);
 	    i += len;
 	  }
@@ -1266,7 +1270,10 @@ print (obj, printcharfun, escapeflag)
 		{
 		  c = STRING_CHAR_AND_CHAR_LENGTH (str + i_byte,
 						   size_byte - i_byte, len);
-		  i_byte += len;
+		  if (CHAR_VALID_P (c, 0))
+		    i_byte += len;
+		  else
+		    c = str[i_byte++];
 		}
 	      else
 		c = str[i_byte++];
-- 
2.39.2