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

* lread.c (read1): Simplify slightly to avoid an overflow warning

Browse source 
with GCC 4.7.0 on x86-64.
This commit is contained in:
Paul Eggert 2012-05-26 01:30:49 -07:00
parent 4446092aff
commit 4cfd81f6c9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-26 Paul Eggert <eggert@cs.ucla.edu>
* lread.c (read1): Simplify slightly to avoid an overflow warning
with GCC 4.7.0 on x86-64.
2012-05-26 Eli Zaretskii <eliz@gnu.org>
* bidi.c (bidi_mirror_char): Revert last change: an int is

11
src/lread.c
View file

@ -2986,19 +2986,14 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
return make_number (0);
if (force_multibyte)
/* READ_BUFFER already contains valid multibyte forms. */
;
else if (force_singlebyte)
if (! force_multibyte && force_singlebyte)
{
/* READ_BUFFER contains raw 8-bit bytes and no multibyte
forms. Convert it to unibyte. */
nchars = str_as_unibyte ((unsigned char *) read_buffer,
p - read_buffer);
p = read_buffer + nchars;
}
else
{
/* Otherwise, READ_BUFFER contains only ASCII. */
}
return make_specified_string (read_buffer, nchars, p - read_buffer,
(force_multibyte