Merge from trunk.

2 files changed, 9 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ac09c6c821..7b09cb744a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -774,6 +774,11 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-09-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lread.c (readevalloop): Use correct code for NBSP.
+        (read1): Likewise.  (Bug#9608)
+
 2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (Fdbus_register_signal): When service is not
diff --git a/src/lread.c b/src/lread.c
index e427688fdc7..1179d63436f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1801,7 +1801,7 @@ readevalloop (Lisp_Object readcharfun,
 
       /* Ignore whitespace here, so we can detect eof.  */
       if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r'
-          || c == 0x8a0)  /* NBSP */
+          || c == 0xa0)  /* NBSP */
         goto read_next;
 
       if (!NILP (Vpurify_flag) && c == '(')
@@ -2689,7 +2689,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
           uninterned_symbol = 1;
           c = READCHAR;
           if (!(c > 040
-                && c != 0x8a0
+                && c != 0xa0    /* NBSP */
                 && (c >= 0200
                     || strchr ("\"';()[]#`,", c) == NULL)))
             {
@@ -3037,7 +3037,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
     default:
     default_label:
       if (c <= 040) goto retry;
-      if (c == 0x8a0) /* NBSP */
+      if (c == 0xa0) /* NBSP */
         goto retry;
 
     read_symbol:
@@ -3078,7 +3078,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               c = READCHAR;
             }
           while (c > 040
-                 && c != 0x8a0 /* NBSP */
+                 && c != 0xa0 /* NBSP */
                  && (c >= 0200
                      || strchr ("\"';()[]#`,", c) == NULL));