upstream

6 files changed, 69 insertions, 12 deletions

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 4e4fd344672..743dd02917d 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -17,14 +17,26 @@
 
 # Copyright (C) 2002-2011 Free Software Foundation, Inc.
 #
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -167,9 +179,11 @@ GMALLOC_OBJ = @GMALLOC_OBJ@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
+GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
@@ -179,6 +193,8 @@ GNULIB_FCHDIR = @GNULIB_FCHDIR@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
 GNULIB_FGETC = @GNULIB_FGETC@
 GNULIB_FGETS = @GNULIB_FGETS@
@@ -193,6 +209,7 @@ GNULIB_FREOPEN = @GNULIB_FREOPEN@
 GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
+GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -242,6 +259,7 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
@@ -256,6 +274,7 @@ GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_RAISE = @GNULIB_RAISE@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
@@ -327,6 +346,7 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
 HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
 HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
@@ -356,6 +376,7 @@ HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -391,13 +412,16 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_OS_H = @HAVE_OS_H@
+HAVE_PCLOSE = @HAVE_PCLOSE@
 HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POPEN = @HAVE_POPEN@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_RAISE = @HAVE_RAISE@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_READLINK = @HAVE_READLINK@
@@ -566,6 +590,7 @@ REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
+REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -608,6 +633,7 @@ REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_RAISE = @REPLACE_RAISE@
 REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
 REPLACE_REALLOC = @REPLACE_REALLOC@
@@ -1169,11 +1195,13 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
               -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
+              -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
               -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
               -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
               -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
               -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
               -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
+              -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
               -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
               -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
               -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
@@ -1181,6 +1209,7 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
               -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
               -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
+              -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -1309,6 +1338,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
               -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
               -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
+              -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
               -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
               -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
               -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
@@ -1333,6 +1363,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+              -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
               -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
               -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
               -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
@@ -1371,11 +1402,14 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
               -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
               -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+              -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
+              -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
               -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
               -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
               -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
               -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
               -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+              -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
               -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
               -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
               -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -1507,6 +1541,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
               -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
+              -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
               -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
               -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
               -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
@@ -1589,8 +1624,10 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+              -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
               -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
               -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
+              -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
               -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
               -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
               -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
@@ -1598,6 +1635,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
               -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
               -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
+              -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
               -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
               -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
               -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
@@ -1641,6 +1679,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
               -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
               -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
+              -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
               -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
               -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
               -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
@@ -1665,6 +1704,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
               -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
               -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
+              -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
               -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
               -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
               -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
diff --git a/autogen/config.in b/autogen/config.in
index 3b88849a1e7..cbf7c225bd7 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1273,6 +1273,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
 /* Define to the name of the strftime replacement function. */
 #undef my_strftime
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa350161555..ec867fee08b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-27  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-internal): Accept cons cell HIST arg.
+
 2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/dbus.el (dbus-unregister-object): Don't release services for
diff --git a/lisp/ido.el b/lisp/ido.el
index 4086000e3e9..46ac5784d0e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1826,7 +1826,7 @@ This function also adds a hook to the minibuffer."
 ;;       e.g. the file name may be ignored or joined with ido-current-directory, and
 ;;       the relevant function is called (find-file, write-file, etc).
 
-(defun ido-read-internal (item prompt history &optional default require-match initial)
+(defun ido-read-internal (item prompt hist &optional default require-match initial)
   "Perform the `ido-read-buffer' and `ido-read-file-name' functions.
 Return the name of a buffer or file selected.
 PROMPT is the prompt to give to the user.
@@ -1984,7 +1984,7 @@ If INITIAL is non-nil, it specifies the initial input string."
                 (read-from-minibuffer (ido-make-prompt item prompt)
                                       (prog1 ido-text-init
                                         (setq ido-text-init nil))
-                                      ido-completion-map nil history))))
+                                      ido-completion-map nil hist))))
       (ido-trace "read-from-minibuffer" ido-final-text)
       (if (get-buffer ido-completion-buffer)
           (kill-buffer ido-completion-buffer))
@@ -2155,7 +2155,12 @@ If INITIAL is non-nil, it specifies the initial input string."
 
          (t
           (setq done t))))))
-    (add-to-history (or history 'minibuffer-history) ido-selected)
+    (add-to-history (cond
+                     ((consp hist)
+                      (or (car hist) 'minibuffer-history))
+                     (hist hist)
+                     (t 'minibuffer-history))
+                    ido-selected)
     ido-selected))
 
 (defun ido-edit-input ()
diff --git a/src/ChangeLog b/src/ChangeLog
index 3282654ab06..59169bdcf9f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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 2b1b49ab2fe..241b1e41c94 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1796,7 +1796,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 == '(')
@@ -2685,7 +2685,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)))
             {
@@ -3033,7 +3033,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:
@@ -3074,7 +3074,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));