aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-06-12 16:18:05 -0700
committerPaul Eggert2015-06-12 16:28:09 -0700
commitd4870a525dcd7dc233a1ed1df676885bad27ee16 (patch)
tree08a453e49eb429bf194a50d25896c0e47aa6f807 /src
parentf8e26cd3af6b48428c3199f3f9c2a08c4f359234 (diff)
downloademacs-d4870a525dcd7dc233a1ed1df676885bad27ee16.tar.gz
emacs-d4870a525dcd7dc233a1ed1df676885bad27ee16.zip
* src/print.c (print_object): Minor simplification.
Diffstat (limited to 'src')
-rw-r--r--src/print.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/print.c b/src/print.c
index 65c120dbb4f..f396151eaa1 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1586,33 +1586,32 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
1586 && print_depth > XINT (Vprint_level)) 1586 && print_depth > XINT (Vprint_level))
1587 print_c_string ("...", printcharfun); 1587 print_c_string ("...", printcharfun);
1588 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) 1588 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
1589 && (EQ (XCAR (obj), Qquote))) 1589 && EQ (XCAR (obj), Qquote))
1590 { 1590 {
1591 printchar ('\'', printcharfun); 1591 printchar ('\'', printcharfun);
1592 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); 1592 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
1593 } 1593 }
1594 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) 1594 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
1595 && (EQ (XCAR (obj), Qfunction))) 1595 && EQ (XCAR (obj), Qfunction))
1596 { 1596 {
1597 print_c_string ("#'", printcharfun); 1597 print_c_string ("#'", printcharfun);
1598 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); 1598 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
1599 } 1599 }
1600 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) 1600 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
1601 && ((EQ (XCAR (obj), Qbackquote)))) 1601 && EQ (XCAR (obj), Qbackquote))
1602 { 1602 {
1603 print_object (XCAR (obj), printcharfun, 0); 1603 printchar ('`', printcharfun);
1604 new_backquote_output++; 1604 new_backquote_output++;
1605 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); 1605 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
1606 new_backquote_output--; 1606 new_backquote_output--;
1607 } 1607 }
1608 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) 1608 else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
1609 && new_backquote_output 1609 && new_backquote_output
1610 && ((EQ (XCAR (obj), Qbackquote) 1610 && (EQ (XCAR (obj), Qcomma)
1611 || EQ (XCAR (obj), Qcomma) 1611 || EQ (XCAR (obj), Qcomma_at)
1612 || EQ (XCAR (obj), Qcomma_at) 1612 || EQ (XCAR (obj), Qcomma_dot)))
1613 || EQ (XCAR (obj), Qcomma_dot))))
1614 { 1613 {
1615 print_object (XCAR (obj), printcharfun, 0); 1614 print_object (XCAR (obj), printcharfun, false);
1616 new_backquote_output--; 1615 new_backquote_output--;
1617 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag); 1616 print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
1618 new_backquote_output++; 1617 new_backquote_output++;