From: Kenichi Handa <handa@m17n.org>
Date: Wed, 14 May 2008 01:39:58 +0000 (+0000)
Subject: Include font.h.
X-Git-Tag: emacs-pretest-23.0.90~5562
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a7b7982aea93d5bac211492b057b78f3c7ba261;p=emacs.git

Include font.h.
(print_object): Handle font-related objects.
---

diff --git a/src/print.c b/src/print.c
index d5453ce74ef..82c987a85dd 100644
--- a/src/print.c
+++ b/src/print.c
@@ -36,6 +36,7 @@ Boston, MA 02110-1301, USA.  */
 #include "intervals.h"
 #include "blockinput.h"
 #include "termhooks.h"		/* For struct terminal.  */
+#include "font.h"
 
 Lisp_Object Vstandard_output, Qstandard_output;
 
@@ -2129,6 +2130,34 @@ print_object (obj, printcharfun, escapeflag)
 	  strout (buf, -1, -1, printcharfun, 0);
 	  PRINTCHAR ('>');
 	}
+      else if (FONTP (obj))
+	{
+	  EMACS_INT i;
+
+	  if (! FONT_OBJECT_P (obj))
+	    {
+	      if (FONT_SPEC_P (obj))
+		strout ("#<font-spec", -1, -1, printcharfun, 0);
+	      else
+		strout ("#<font-entity", -1, -1, printcharfun, 0);
+	      for (i = 0; i < FONT_SPEC_MAX; i++)
+		{
+		  PRINTCHAR (' ');
+		  if (i < FONT_WEIGHT_INDEX || i > FONT_WIDTH_INDEX)
+		    print_object (AREF (obj, i), printcharfun, escapeflag);
+		  else
+		    print_object (font_style_symbolic (obj, i, 0),
+				  printcharfun, escapeflag);
+		}
+	    }
+	  else
+	    {
+	      strout ("#<font-object ", -1, -1, printcharfun, 0);
+	      print_object (AREF (obj, FONT_NAME_INDEX), printcharfun,
+			    escapeflag);
+	    }
+	  PRINTCHAR ('>');
+	}
       else
 	{
 	  EMACS_INT size = XVECTOR (obj)->size;