From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 10 Aug 2007 08:01:30 +0000 (+0000)
Subject: (new_backquote_output): Rename from old_backquote_output.
X-Git-Tag: emacs-pretest-22.1.90~1023
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a22dec271e8bb8be08a87e9aad39bb59ffb4d284;p=emacs.git

(new_backquote_output): Rename from old_backquote_output.
(print): Inverse its logic (according to its name) so as to match the
behavior of new_backquote_flag in lread.c.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 20469ca12e3..dd86df3ef62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* print.c (new_backquote_output): Rename from old_backquote_output.
+	(print): Inverse its logic (according to its name) so as to match the
+	behavior of new_backquote_flag in lread.c.
+
 2007-08-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* gmalloc.c (posix_memalign): New function.
diff --git a/src/print.c b/src/print.c
index f7060024f32..cae80d1acfe 100644
--- a/src/print.c
+++ b/src/print.c
@@ -93,8 +93,8 @@ Lisp_Object Vfloat_output_format, Qfloat_output_format;
 /* Avoid actual stack overflow in print.  */
 int print_depth;
 
-/* Nonzero if inside outputting backquote in old style.  */
-int old_backquote_output;
+/* Level of nesting inside outputting backquote in new style.  */
+int new_backquote_output;
 
 /* Detect most circularities to print finite output.  */
 #define PRINT_CIRCLE 200
@@ -1291,7 +1291,7 @@ print (obj, printcharfun, escapeflag)
      register Lisp_Object printcharfun;
      int escapeflag;
 {
-  old_backquote_output = 0;
+  new_backquote_output = 0;
 
   /* Reset print_number_index and Vprint_number_table only when
      the variable Vprint_continuous_numbering is nil.  Otherwise,
@@ -1756,14 +1756,24 @@ print_object (obj, printcharfun, escapeflag)
 	  print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
 	}
       else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
-	       && ! old_backquote_output
+	       && ((EQ (XCAR (obj), Qbackquote))))
+	{
+	  print_object (XCAR (obj), printcharfun, 0);
+	  new_backquote_output++;
+	  print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
+	  new_backquote_output--;
+	}
+      else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
+	       && new_backquote_output
 	       && ((EQ (XCAR (obj), Qbackquote)
 		    || EQ (XCAR (obj), Qcomma)
 		    || EQ (XCAR (obj), Qcomma_at)
 		    || EQ (XCAR (obj), Qcomma_dot))))
 	{
 	  print_object (XCAR (obj), printcharfun, 0);
+	  new_backquote_output--;
 	  print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
+	  new_backquote_output++;
 	}
       else
 	{
@@ -1783,9 +1793,7 @@ print_object (obj, printcharfun, escapeflag)
 	      print_object (Qbackquote, printcharfun, 0);
 	      PRINTCHAR (' ');
 
-	      ++old_backquote_output;
 	      print_object (XCAR (XCDR (tem)), printcharfun, 0);
-	      --old_backquote_output;
 	      PRINTCHAR (')');
 
 	      obj = XCDR (obj);