procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(make_string): Fix previous change. Be sure to make

Browse source 
unibyte string correctly.
This commit is contained in:
Kenichi Handa 2000-11-20 01:06:33 +00:00
parent 030de92f84
commit 495a6df36d
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2000-11-20 Kenichi Handa <handa@etl.go.jp>
* alloc.c (make_string): Fix previous change. Be sure to make
unibyte string correctly.
2000-11-19 Gerd Moellmann <gerd@gnu.org>
* window.c (Fwindow_list): Change parameter list to be XEmacs

6
src/alloc.c
View file

@ -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;
}