diff options
| author | Kim F. Storm | 2004-11-09 13:24:19 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-11-09 13:24:19 +0000 |
| commit | 95af0924b48a0ac6efe95a0f337f2ac0ee855ff0 (patch) | |
| tree | 984eec511e1217c122dcf3bc4a2c84738c3504a0 /src | |
| parent | e870dd8926361dc10bd72cbde04794d9d92e7aa7 (diff) | |
| download | emacs-95af0924b48a0ac6efe95a0f337f2ac0ee855ff0.tar.gz emacs-95af0924b48a0ac6efe95a0f337f2ac0ee855ff0.zip | |
(read1): Fix next_char matching.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lread.c b/src/lread.c index db83623e054..e87dba53128 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -2374,7 +2374,7 @@ read1 (readcharfun, pch, first_in_list) | |||
| 2374 | c = 0; | 2374 | c = 0; |
| 2375 | else if (c == (CHAR_CTL | '?')) | 2375 | else if (c == (CHAR_CTL | '?')) |
| 2376 | c = 127; | 2376 | c = 127; |
| 2377 | 2377 | ||
| 2378 | if (c & CHAR_SHIFT) | 2378 | if (c & CHAR_SHIFT) |
| 2379 | { | 2379 | { |
| 2380 | /* Shift modifier is valid only with [A-Za-z]. */ | 2380 | /* Shift modifier is valid only with [A-Za-z]. */ |
| @@ -2459,9 +2459,9 @@ read1 (readcharfun, pch, first_in_list) | |||
| 2459 | 2459 | ||
| 2460 | if (next_char <= 040 | 2460 | if (next_char <= 040 |
| 2461 | || (next_char < 0200 | 2461 | || (next_char < 0200 |
| 2462 | && index ("\"';([#?", next_char) | 2462 | && (index ("\"';([#?", next_char) |
| 2463 | || (!first_in_list && next_char == '`') | 2463 | || (!first_in_list && next_char == '`') |
| 2464 | || (new_backquote_flag && next_char == ','))) | 2464 | || (new_backquote_flag && next_char == ',')))) |
| 2465 | { | 2465 | { |
| 2466 | *pch = c; | 2466 | *pch = c; |
| 2467 | return Qnil; | 2467 | return Qnil; |
| @@ -3681,7 +3681,7 @@ init_lread () | |||
| 3681 | /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is | 3681 | /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is |
| 3682 | almost never correct, thereby causing a warning to be printed out that | 3682 | almost never correct, thereby causing a warning to be printed out that |
| 3683 | confuses users. Since PATH_LOADSEARCH is always overridden by the | 3683 | confuses users. Since PATH_LOADSEARCH is always overridden by the |
| 3684 | EMACSLOADPATH environment variable below, disable the warning on NT. | 3684 | EMACSLOADPATH environment variable below, disable the warning on NT. |
| 3685 | Also, when using the "self-contained" option for Carbon Emacs for MacOSX, | 3685 | Also, when using the "self-contained" option for Carbon Emacs for MacOSX, |
| 3686 | the "standard" paths may not exist and would be overridden by | 3686 | the "standard" paths may not exist and would be overridden by |
| 3687 | EMACSLOADPATH as on NT. Since this depends on how the executable | 3687 | EMACSLOADPATH as on NT. Since this depends on how the executable |