diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-06-26 07:25:05 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-06-26 07:25:05 +0000 |
| commit | 38200aabca7abf8d6f67aeaeb7c5bfac86ebe0c4 (patch) | |
| tree | 85fda97469795dc75f8d514a7e9e27a2cd5eaedb /src/xdisp.c | |
| parent | 3fa10870aa567d0769b15f00757ace90bc8d0d49 (diff) | |
| download | emacs-38200aabca7abf8d6f67aeaeb7c5bfac86ebe0c4.tar.gz | |
(handle_auto_composed_prop): Fix for the terminal case.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 8 |
1 files changed, 5 insertions, 3 deletions
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); |