Commit 617a0e83 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* src/print.c (print_object): Never print old-style backquotes.

Obey escapeflag for hash tables as well.
parent d41d18c0
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> 2011-02-23 Kenichi Handa <handa@m17n.org>
   
* font.c (font_open_entity): Be sure to set scaled_pixel_size. * font.c (font_open_entity): Be sure to set scaled_pixel_size.
...@@ -1683,26 +1683,6 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag ...@@ -1683,26 +1683,6 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
{ {
PRINTCHAR ('('); 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; EMACS_INT print_length;
int i; int i;
...@@ -1906,25 +1886,25 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag ...@@ -1906,25 +1886,25 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
if (!NILP (h->test)) if (!NILP (h->test))
{ {
strout (" test ", -1, -1, printcharfun, 0); strout (" test ", -1, -1, printcharfun, 0);
print_object (h->test, printcharfun, 0); print_object (h->test, printcharfun, escapeflag);
} }
if (!NILP (h->weak)) if (!NILP (h->weak))
{ {
strout (" weakness ", -1, -1, printcharfun, 0); strout (" weakness ", -1, -1, printcharfun, 0);
print_object (h->weak, printcharfun, 0); print_object (h->weak, printcharfun, escapeflag);
} }
if (!NILP (h->rehash_size)) if (!NILP (h->rehash_size))
{ {
strout (" rehash-size ", -1, -1, printcharfun, 0); 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)) if (!NILP (h->rehash_threshold))
{ {
strout (" rehash-threshold ", -1, -1, printcharfun, 0); 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); strout (" data ", -1, -1, printcharfun, 0);
...@@ -1943,9 +1923,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag ...@@ -1943,9 +1923,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
if (!NILP (HASH_HASH (h, i))) if (!NILP (HASH_HASH (h, i)))
{ {
if (i) PRINTCHAR (' '); if (i) PRINTCHAR (' ');
print_object (HASH_KEY (h, i), printcharfun, 1); print_object (HASH_KEY (h, i), printcharfun, escapeflag);
PRINTCHAR (' '); PRINTCHAR (' ');
print_object (HASH_VALUE (h, i), printcharfun, 1); print_object (HASH_VALUE (h, i), printcharfun, escapeflag);
} }
if (size < real_size) if (size < real_size)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment