From 495a6df36d7e6f8fa29084076e738ca3f2a07985 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 20 Nov 2000 01:06:33 +0000 Subject: [PATCH] (make_string): Fix previous change. Be sure to make unibyte string correctly. --- src/ChangeLog | 5 +++++ src/alloc.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a88fc35df91..855b89bbb1b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-11-20 Kenichi Handa + + * alloc.c (make_string): Fix previous change. Be sure to make + unibyte string correctly. + 2000-11-19 Gerd Moellmann * window.c (Fwindow_list): Change parameter list to be XEmacs diff --git a/src/alloc.c b/src/alloc.c index 625dc14720f..bf93f6705b4 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1701,12 +1701,12 @@ make_string (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 (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); + val = make_unibyte_string (contents, nbytes); + else + val = make_multibyte_string (contents, nchars, nbytes); return val; } -- 2.39.2