# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1214465105 0
# Node ID ae2a8f2ce5728831eb544c1413b29df3b747dce3
# Parent  3d199260abfd3c86c0f00e4c02ede167c9f08c01
(handle_auto_composed_prop): Fix for the terminal case.

diff -r 3d199260abfd -r ae2a8f2ce572 src/xdisp.c
--- a/src/xdisp.c	Thu Jun 26 07:19:01 2008 +0000
+++ b/src/xdisp.c	Thu Jun 26 07:25:05 2008 +0000
@@ -4588,7 +4588,7 @@
 {
   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 @@
 	      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);