aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2003-02-18 16:11:17 +0000
committerKim F. Storm2003-02-18 16:11:17 +0000
commitcce5761e5e4a0a1152268db74dedf9ea5647f34a (patch)
tree76c780c31b4b87bfe76326ffc8e1902f0569c983 /src
parent4cd519a765a1e91a00d4bd58ee98fa842e9add57 (diff)
downloademacs-cce5761e5e4a0a1152268db74dedf9ea5647f34a.tar.gz
emacs-cce5761e5e4a0a1152268db74dedf9ea5647f34a.zip
(read1): Fix last change; "`" is not always special.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lread.c b/src/lread.c
index fc236ea84d9..f5d639e4494 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2271,13 +2271,15 @@ read1 (readcharfun, pch, first_in_list)
2271 UNREAD (next_next_char); 2271 UNREAD (next_next_char);
2272 2272
2273 ok = (next_next_char <= 040 2273 ok = (next_next_char <= 040
2274 || index ("\"'`;([#?", next_next_char) 2274 || index ("\"';([#?", next_next_char)
2275 || (!first_in_list && next_next_char == '`')
2275 || (new_backquote_flag && next_next_char == ',')); 2276 || (new_backquote_flag && next_next_char == ','));
2276 } 2277 }
2277 else 2278 else
2278 { 2279 {
2279 ok = (next_char <= 040 2280 ok = (next_char <= 040
2280 || index ("\"'`;()[]#", next_char) 2281 || index ("\"';()[]#", next_char)
2282 || (!first_in_list && next_char == '`')
2281 || (new_backquote_flag && next_char == ',')); 2283 || (new_backquote_flag && next_char == ','));
2282 } 2284 }
2283 UNREAD (next_char); 2285 UNREAD (next_char);
@@ -2436,7 +2438,8 @@ read1 (readcharfun, pch, first_in_list)
2436 UNREAD (next_char); 2438 UNREAD (next_char);
2437 2439
2438 if (next_char <= 040 2440 if (next_char <= 040
2439 || index ("\"'`;([#?", next_char) 2441 || index ("\"';([#?", next_char)
2442 || (!first_in_list && next_char == '`')
2440 || (new_backquote_flag && next_char == ',')) 2443 || (new_backquote_flag && next_char == ','))
2441 { 2444 {
2442 *pch = c; 2445 *pch = c;
@@ -2458,7 +2461,8 @@ read1 (readcharfun, pch, first_in_list)
2458 char *end = read_buffer + read_buffer_size; 2461 char *end = read_buffer + read_buffer_size;
2459 2462
2460 while (c > 040 2463 while (c > 040
2461 && !index ("\"'`;()[]#", c) 2464 && !index ("\"';()[]#", c)
2465 && !(!first_in_list && c == '`')
2462 && !(new_backquote_flag && c == ',')) 2466 && !(new_backquote_flag && c == ','))
2463 { 2467 {
2464 if (end - p < MAX_MULTIBYTE_LENGTH) 2468 if (end - p < MAX_MULTIBYTE_LENGTH)