Merge from emacs--devo--0

[gnu-emacs] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index 5f4d69a3312b9400a07293de15da7e153d80e78a..78e8b2730fe898314e4a9ddd196330c64850ea38 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -1503,7 +1503,8 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
        }
 
       /* Ignore whitespace here, so we can detect eof.  */
        }
 
       /* Ignore whitespace here, so we can detect eof.  */

-      if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r')
+      if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r'
+         || c == 0x8a0)  /* NBSP */

        goto read_next;
 
       if (!NILP (Vpurify_flag) && c == '(')
        goto read_next;
 
       if (!NILP (Vpurify_flag) && c == '(')


@@ -2695,7 +2696,9 @@ read1 (readcharfun, pch, first_in_list)
       }
     default:
     default_label:
       }
     default:
     default_label:

-      if (c <= 040) goto retry;
+      if (c <= 040) goto retry;        
+      if (c == 0x8a0) /* NBSP */
+       goto retry;

       {
        char *p = read_buffer;
        int quoted = 0;
       {
        char *p = read_buffer;
        int quoted = 0;


@@ -2704,6 +2707,7 @@ read1 (readcharfun, pch, first_in_list)
          char *end = read_buffer + read_buffer_size;
 
          while (c > 040
          char *end = read_buffer + read_buffer_size;
 
          while (c > 040

+                && c != 0x8a0 /* NBSP */

                 && (c >= 0200
                     || (!index ("\"';()[]#", c)
                         && !(!first_in_list && c == '`')
                 && (c >= 0200
                     || (!index ("\"';()[]#", c)
                         && !(!first_in_list && c == '`')