From 9eac9d597c990e4b57c2ca079e5b57f2eb1270ae Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 19 May 2000 23:49:35 +0000 Subject: [PATCH] (Fmake_byte_code): If BYTECODE-STRING is multibyte, convert it to unibyte. (make_string): Use parse_str_as_multibyte, not chars_in_text. --- src/alloc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index f6f5c2c0ff8..0c58f3cc1be 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1390,10 +1390,14 @@ make_string (contents, nbytes) int nbytes; { register Lisp_Object val; - int nchars = chars_in_text (contents, nbytes); + int nchars, multibyte_nbytes; + + parse_str_as_multibyte (contents, nbytes, &nchars, &multibyte_nbytes); val = make_uninit_multibyte_string (nchars, nbytes); bcopy (contents, XSTRING (val)->data, nbytes); - if (STRING_BYTES (XSTRING (val)) == XSTRING (val)->size) + if (nbytes == nchars || nbytes != multibyte_nbytes) + /* CONTENTS contains no multibyte sequences or contains an invalid + multibyte sequence. We must make unibyte string. */ SET_STRING_BYTES (XSTRING (val), -1); return val; } @@ -1953,6 +1957,15 @@ significance.") val = make_pure_vector ((EMACS_INT) nargs); else val = Fmake_vector (len, Qnil); + + if (STRINGP (args[1]) && STRING_MULTIBYTE (args[1])) + /* BYTECODE-STRING must have been produced by Emacs 20.2 or the + earlier because they produced a raw 8-bit string for byte-code + and now such a byte-code string is loaded as multibyte while + raw 8-bit characters converted to multibyte form. Thus, now we + must convert them back to the original unibyte form. */ + args[1] = Fstring_as_unibyte (args[1]); + p = XVECTOR (val); for (index = 0; index < nargs; index++) { -- 2.39.5