From: Kenichi Handa <handa@m17n.org>
Date: Thu, 26 Jun 2008 07:25:25 +0000 (+0000)
Subject: (handle_auto_composed_prop): Fix for the terminal case.
X-Git-Tag: emacs-pretest-23.0.90~4470
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fc66bcae50b13f2d62ff6ed4c2952cd93ebced5;p=emacs.git

(handle_auto_composed_prop): Fix for the terminal case.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4450763e1a9..158d00d9f0a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-26  Kenichi Handa  <handa@m17n.org>
+
+	* xdisp.c (handle_auto_composed_prop): Fix for the terminal case.
+
 2008-06-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* unexnext.c:
diff --git a/src/xdisp.c b/src/xdisp.c
index ad2de16c7b5..430298aa444 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4588,7 +4588,7 @@ handle_auto_composed_prop (it)
 {
   enum prop_handled handled = HANDLED_NORMALLY;
 
-  if (FRAME_WINDOW_P (it->f) && FUNCTIONP (Vauto_composition_function))
+  if (FUNCTIONP (Vauto_composition_function))
     {
       Lisp_Object val = Qnil;
       EMACS_INT pos, limit = -1;
@@ -4654,8 +4654,10 @@ handle_auto_composed_prop (it)
 	      int count = SPECPDL_INDEX ();
 	      Lisp_Object args[5];
 
-	      limit = font_range (pos, limit, FACE_FROM_ID (it->f, it->face_id),
-				  it->f, it->string);
+	      if (FRAME_WINDOW_P (it->f))
+		limit = font_range (pos, limit,
+				    FACE_FROM_ID (it->f, it->face_id),
+				    it->f, it->string);
 	      args[0] = Vauto_composition_function;
 	      specbind (Qauto_composition_function, Qnil);
 	      args[1] = make_number (pos);