(Vold_style_backquotes): New var.

(syms_of_lread): Init and staticpro it.
(read1): Set it when we find an old-style (back)quote.

diff --git a/src/ChangeLog b/src/ChangeLog
index f7a8ada5becb5656d13dbec9223d2b2bae14b65f..b696ae06b49c294f55f75d3dc5b0cbdca2db5605 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * lread.c (Vold_style_backquotes): New var.
+       (syms_of_lread): Init and staticpro it.
+       (read1): Set it when we find an old-style (back)quote.
+
 2007-08-22  Jason Rumney  <jasonr@gnu.org>
 
        * w32reg.c (SYSTEM_DEFAULT_RESOURCES): Add missing NULL terminator.

diff --git a/src/lread.c b/src/lread.c
index 5037937e08b18abffb39fdbd73f742f6daf73af6..76676f64b2eb4cd0e465a5551b9329cbabe580cd 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -193,6 +193,7 @@ static file_offset prev_saved_doc_string_position;
    Fread initializes this to zero, so we need not specbind it
    or worry about what happens to it when there is an error.  */
 static int new_backquote_flag;
+static Lisp_Object Vold_style_backquotes;
 
 /* A list of file names for files being loaded in Fload.  Used to
    check for recursive loads.  */
@@ -2442,7 +2443,10 @@ read1 (readcharfun, pch, first_in_list)
 
     case '`':
       if (first_in_list)
-       goto default_label;
+       {
+         Vold_style_backquotes = Qt;
+         goto default_label;
+       }
       else
        {
          Lisp_Object value;
@@ -2477,7 +2481,10 @@ read1 (readcharfun, pch, first_in_list)
          return Fcons (comma_type, Fcons (value, Qnil));
        }
       else
-       goto default_label;
+       {
+         Vold_style_backquotes = Qt;
+         goto default_label;
+       }
 
     case '?':
       {
@@ -4247,6 +4254,9 @@ to load.  See also `load-dangerous-libraries'.  */);
 
   Vloads_in_progress = Qnil;
   staticpro (&Vloads_in_progress);
+
+  Vold_style_backquotes = Qnil;
+  staticpro (&Vold_style_backquotes);
 }
 
 /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d