Mercurial > emacs
changeset 28997:fc8d42f77d4f
(Fmake_byte_code): If BYTECODE-STRING is multibyte,
convert it to unibyte.
(make_string): Use parse_str_as_multibyte, not chars_in_text.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 19 May 2000 23:49:35 +0000 |
| parents | 679eb595bbc0 |
| children | d8c9e2f7022f |
| files | src/alloc.c |
| diffstat | 1 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/alloc.c Fri May 19 23:48:03 2000 +0000 +++ b/src/alloc.c Fri May 19 23:49:35 2000 +0000 @@ -1390,10 +1390,14 @@ 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 @@ 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++) {