diff options
| author | Stefan Monnier | 2007-08-22 15:43:46 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-22 15:43:46 +0000 |
| commit | 9ecb827bd9496950140164fb73a66309ca275408 (patch) | |
| tree | d9c510c377177cab3db3b26e8401d158ed004d6b /src | |
| parent | 1d7e63566756032d3337687f7c8c4e8e35316dfa (diff) | |
| download | emacs-9ecb827bd9496950140164fb73a66309ca275408.tar.gz emacs-9ecb827bd9496950140164fb73a66309ca275408.zip | |
(Vold_style_backquotes): New var.
(syms_of_lread): Init and staticpro it.
(read1): Set it when we find an old-style (back)quote.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lread.c | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f7a8ada5bec..b696ae06b49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-08-22 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * lread.c (Vold_style_backquotes): New var. | ||
| 4 | (syms_of_lread): Init and staticpro it. | ||
| 5 | (read1): Set it when we find an old-style (back)quote. | ||
| 6 | |||
| 1 | 2007-08-22 Jason Rumney <jasonr@gnu.org> | 7 | 2007-08-22 Jason Rumney <jasonr@gnu.org> |
| 2 | 8 | ||
| 3 | * w32reg.c (SYSTEM_DEFAULT_RESOURCES): Add missing NULL terminator. | 9 | * w32reg.c (SYSTEM_DEFAULT_RESOURCES): Add missing NULL terminator. |
diff --git a/src/lread.c b/src/lread.c index 5037937e08b..76676f64b2e 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -193,6 +193,7 @@ static file_offset prev_saved_doc_string_position; | |||
| 193 | Fread initializes this to zero, so we need not specbind it | 193 | Fread initializes this to zero, so we need not specbind it |
| 194 | or worry about what happens to it when there is an error. */ | 194 | or worry about what happens to it when there is an error. */ |
| 195 | static int new_backquote_flag; | 195 | static int new_backquote_flag; |
| 196 | static Lisp_Object Vold_style_backquotes; | ||
| 196 | 197 | ||
| 197 | /* A list of file names for files being loaded in Fload. Used to | 198 | /* A list of file names for files being loaded in Fload. Used to |
| 198 | check for recursive loads. */ | 199 | check for recursive loads. */ |
| @@ -2442,7 +2443,10 @@ read1 (readcharfun, pch, first_in_list) | |||
| 2442 | 2443 | ||
| 2443 | case '`': | 2444 | case '`': |
| 2444 | if (first_in_list) | 2445 | if (first_in_list) |
| 2445 | goto default_label; | 2446 | { |
| 2447 | Vold_style_backquotes = Qt; | ||
| 2448 | goto default_label; | ||
| 2449 | } | ||
| 2446 | else | 2450 | else |
| 2447 | { | 2451 | { |
| 2448 | Lisp_Object value; | 2452 | Lisp_Object value; |
| @@ -2477,7 +2481,10 @@ read1 (readcharfun, pch, first_in_list) | |||
| 2477 | return Fcons (comma_type, Fcons (value, Qnil)); | 2481 | return Fcons (comma_type, Fcons (value, Qnil)); |
| 2478 | } | 2482 | } |
| 2479 | else | 2483 | else |
| 2480 | goto default_label; | 2484 | { |
| 2485 | Vold_style_backquotes = Qt; | ||
| 2486 | goto default_label; | ||
| 2487 | } | ||
| 2481 | 2488 | ||
| 2482 | case '?': | 2489 | case '?': |
| 2483 | { | 2490 | { |
| @@ -4247,6 +4254,9 @@ to load. See also `load-dangerous-libraries'. */); | |||
| 4247 | 4254 | ||
| 4248 | Vloads_in_progress = Qnil; | 4255 | Vloads_in_progress = Qnil; |
| 4249 | staticpro (&Vloads_in_progress); | 4256 | staticpro (&Vloads_in_progress); |
| 4257 | |||
| 4258 | Vold_style_backquotes = Qnil; | ||
| 4259 | staticpro (&Vold_style_backquotes); | ||
| 4250 | } | 4260 | } |
| 4251 | 4261 | ||
| 4252 | /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d | 4262 | /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d |