Commit 4cfd81f6 authored by Paul Eggert's avatar Paul Eggert
Browse files

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

with GCC 4.7.0 on x86-64.
parent 4446092a
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment