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

[bpt/emacs.git] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index 80250cf..7aba203 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -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