Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28

1 files changed, 7 insertions, 3 deletions

diff --git a/src/lread.c b/src/lread.c
index 5f4d69a3312..78e8b2730fe 100644
--- 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
-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,
@@ -1503,7 +1503,8 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
         }
 
       /* 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 == '(')
@@ -2695,7 +2696,9 @@ read1 (readcharfun, pch, first_in_list)
       }
     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;
@@ -2704,6 +2707,7 @@ read1 (readcharfun, pch, first_in_list)
           char *end = read_buffer + read_buffer_size;
 
           while (c > 040
+                 && c != 0x8a0 /* NBSP */
                  && (c >= 0200
                      || (!index ("\"';()[]#", c)
                          && !(!first_in_list && c == '`')