martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(handle_auto_composed_prop): Fix for the terminal case.

Browse Source
This commit is contained in:
Kenichi Handa
2008-06-26 07:25:25 +00:00
parent c123f7fe96
commit 1fc66bcae5
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@@ -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:

8
src/xdisp.c
View File

@@ -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);