From 6f46329ac13a1edbb2596181fb8c083169814b0b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 24 Apr 1998 21:25:31 +0000 Subject: [PATCH] (read1): Allow multibyte and unibyte together in one string. --- src/lread.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lread.c b/src/lread.c index 930c9deac2c..b3a592ce6de 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1797,13 +1797,10 @@ read1 (readcharfun, pch, first_in_list) 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) - nchars = p - read_buffer; - else if (force_multibyte) + if (force_multibyte) nchars = multibyte_chars_in_text (read_buffer, p - read_buffer); + else if (force_singlebyte) + nchars = p - read_buffer; else if (load_convert_to_unibyte) { Lisp_Object string; -- 2.39.2