Mercurial > emacs
changeset 21759:53f1e474e639
(read1): Allow multibyte and unibyte together in one string.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 24 Apr 1998 21:25:31 +0000 |
| parents | bc7f520d8251 |
| children | f97c01dfd603 |
| files | src/lread.c |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lread.c Fri Apr 24 21:24:44 1998 +0000 +++ b/src/lread.c Fri Apr 24 21:25:31 1998 +0000 @@ -1797,13 +1797,10 @@ if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel) return make_number (0); - if (force_singlebyte && force_multibyte) - error ("Multibyte and unibyte characters in one string constant"); - - if (force_singlebyte) + if (force_multibyte) + nchars = multibyte_chars_in_text (read_buffer, p - read_buffer); + else if (force_singlebyte) nchars = p - read_buffer; - else if (force_multibyte) - nchars = multibyte_chars_in_text (read_buffer, p - read_buffer); else if (load_convert_to_unibyte) { Lisp_Object string;