Mercurial > emacs
changeset 96322:ae2a8f2ce572
(handle_auto_composed_prop): Fix for the terminal case.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 26 Jun 2008 07:25:05 +0000 |
| parents | 3d199260abfd |
| children | 3b62d9a85b3f |
| files | src/xdisp.c |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);