diff options
| author | Richard M. Stallman | 2007-07-30 20:07:45 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2007-07-30 20:07:45 +0000 |
| commit | adef3de74046af51a8f17dff767ded2e5197f02a (patch) | |
| tree | 8c81ba1023091f3ab1a3b0a833e5c2a8d2ea3723 | |
| parent | 100edb42a4ea41556832385f89464c1e949bf527 (diff) | |
| download | emacs-adef3de74046af51a8f17dff767ded2e5197f02a.tar.gz emacs-adef3de74046af51a8f17dff767ded2e5197f02a.zip | |
(readevalloop, read1): Treat NBSP as whitespace.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lread.c | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 43c9a9f6686..327597f366c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-07-30 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * lread.c (readevalloop, read1): Treat NBSP as whitespace. | ||
| 4 | |||
| 1 | 2007-07-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 5 | 2007-07-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * gmalloc.c (__malloc_initialize): Remove pthread_once. Not needed. | 7 | * gmalloc.c (__malloc_initialize): Remove pthread_once. Not needed. |
diff --git a/src/lread.c b/src/lread.c index ef999fac74c..20587c6759e 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1501,7 +1501,8 @@ readevalloop (readcharfun, stream, sourcename, evalfun, | |||
| 1501 | } | 1501 | } |
| 1502 | 1502 | ||
| 1503 | /* Ignore whitespace here, so we can detect eof. */ | 1503 | /* Ignore whitespace here, so we can detect eof. */ |
| 1504 | if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r') | 1504 | if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' |
| 1505 | || c == 0x8a0) /* NBSP */ | ||
| 1505 | goto read_next; | 1506 | goto read_next; |
| 1506 | 1507 | ||
| 1507 | if (!NILP (Vpurify_flag) && c == '(') | 1508 | if (!NILP (Vpurify_flag) && c == '(') |
| @@ -2693,7 +2694,9 @@ read1 (readcharfun, pch, first_in_list) | |||
| 2693 | } | 2694 | } |
| 2694 | default: | 2695 | default: |
| 2695 | default_label: | 2696 | default_label: |
| 2696 | if (c <= 040) goto retry; | 2697 | if (c <= 040) goto retry; |
| 2698 | if (c == 0x8a0) /* NBSP */ | ||
| 2699 | goto retry; | ||
| 2697 | { | 2700 | { |
| 2698 | char *p = read_buffer; | 2701 | char *p = read_buffer; |
| 2699 | int quoted = 0; | 2702 | int quoted = 0; |
| @@ -2702,6 +2705,7 @@ read1 (readcharfun, pch, first_in_list) | |||
| 2702 | char *end = read_buffer + read_buffer_size; | 2705 | char *end = read_buffer + read_buffer_size; |
| 2703 | 2706 | ||
| 2704 | while (c > 040 | 2707 | while (c > 040 |
| 2708 | && c != 0x8a0 /* NBSP */ | ||
| 2705 | && (c >= 0200 | 2709 | && (c >= 0200 |
| 2706 | || (!index ("\"';()[]#", c) | 2710 | || (!index ("\"';()[]#", c) |
| 2707 | && !(!first_in_list && c == '`') | 2711 | && !(!first_in_list && c == '`') |