+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:
{
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;
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);