From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 23 Feb 2011 15:14:21 +0000 (-0500)
Subject: * src/print.c (print_object): Never print old-style backquotes.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~746
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=617a0e834a8f3870e28308cd2d04cba6d945f62b;p=emacs.git

* src/print.c (print_object): Never print old-style backquotes.
Obey escapeflag for hash tables as well.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 194f1c44f84..3d22e15c3b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* print.c (print_object): Never print old-style backquotes.
+	Obey escapeflag for hash tables as well.
+
 2011-02-23  Kenichi Handa  <handa@m17n.org>
 
 	* font.c (font_open_entity): Be sure to set scaled_pixel_size.
diff --git a/src/print.c b/src/print.c
index 299cfd41814..29a4bfab790 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1683,26 +1683,6 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
 	{
 	  PRINTCHAR ('(');
 
-	  /* If the first element is a backquote form,
-	     print it old-style so it won't be misunderstood.  */
-	  if (print_quoted && CONSP (XCAR (obj))
-	      && CONSP (XCDR (XCAR (obj)))
-	      && NILP (XCDR (XCDR (XCAR (obj))))
-	      && EQ (XCAR (XCAR (obj)), Qbackquote))
-	    {
-	      Lisp_Object tem;
-	      tem = XCAR (obj);
-	      PRINTCHAR ('(');
-
-	      print_object (Qbackquote, printcharfun, 0);
-	      PRINTCHAR (' ');
-
-	      print_object (XCAR (XCDR (tem)), printcharfun, 0);
-	      PRINTCHAR (')');
-
-	      obj = XCDR (obj);
-	    }
-
 	  {
 	    EMACS_INT print_length;
 	    int i;
@@ -1906,25 +1886,25 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
 	  if (!NILP (h->test))
 	    {
 	      strout (" test ", -1, -1, printcharfun, 0);
-	      print_object (h->test, printcharfun, 0);
+	      print_object (h->test, printcharfun, escapeflag);
 	    }
 
 	  if (!NILP (h->weak))
 	    {
 	      strout (" weakness ", -1, -1, printcharfun, 0);
-	      print_object (h->weak, printcharfun, 0);
+	      print_object (h->weak, printcharfun, escapeflag);
 	    }
 
 	  if (!NILP (h->rehash_size))
 	    {
 	      strout (" rehash-size ", -1, -1, printcharfun, 0);
-	      print_object (h->rehash_size, printcharfun, 0);
+	      print_object (h->rehash_size, printcharfun, escapeflag);
 	    }
 
 	  if (!NILP (h->rehash_threshold))
 	    {
 	      strout (" rehash-threshold ", -1, -1, printcharfun, 0);
-	      print_object (h->rehash_threshold, printcharfun, 0);
+	      print_object (h->rehash_threshold, printcharfun, escapeflag);
 	    }
 
 	  strout (" data ", -1, -1, printcharfun, 0);
@@ -1943,9 +1923,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
 	    if (!NILP (HASH_HASH (h, i)))
 	      {
 		if (i) PRINTCHAR (' ');
-		print_object (HASH_KEY (h, i), printcharfun, 1);
+		print_object (HASH_KEY (h, i), printcharfun, escapeflag);
 		PRINTCHAR (' ');
-		print_object (HASH_VALUE (h, i), printcharfun, 1);
+		print_object (HASH_VALUE (h, i), printcharfun, escapeflag);
 	      }
 
 	  if (size < real_size)