(string_to_multibyte): Always return a multibyte string.

diff --git a/src/ChangeLog b/src/ChangeLog
index 877a73c26572b960e46b11d67260292f3ea4d83a..535558bee2d82ada1db01c52076997de852808d8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-17  Kenichi Handa  <handa@m17n.org>
+
+       * fns.c (string_to_multibyte): Always return a multibyte string.
+
 2003-02-16  Jason Rumney  <jasonr@gnu.org>
 
        * w32fns.c (w32_list_bdf_fonts, w32_list_fonts): Negative

diff --git a/src/fns.c b/src/fns.c
index 69c7418845ee5cbf57b1c5f91aa9b90bd0a207e6..729872722bdb6a3c147b00e2d2f5a63c7da30d6f 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1053,10 +1053,10 @@ string_to_multibyte (string)
     return string;
 
   nbytes = parse_str_to_multibyte (SDATA (string), SBYTES (string));
-  /* If all the chars are ASCII, they won't need any more bytes
-     once converted.  In that case, we can return STRING itself.  */
+  /* If all the chars are ASCII or eight-bit-graphic, they won't need
+     any more bytes once converted.  */
   if (nbytes == SBYTES (string))
-    return string;
+    return make_multibyte_string (SDATA (string), nbytes, nbytes);
 
   buf = (unsigned char *) alloca (nbytes);
   bcopy (SDATA (string), buf, SBYTES (string));