[Emacs-diffs] Changes to emacs/src/xdisp.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/06/26 07:25:07

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1223
retrieving revision 1.1224
diff -u -b -r1.1223 -r1.1224
--- xdisp.c     25 Jun 2008 21:46:49 -0000      1.1223
+++ xdisp.c     26 Jun 2008 07:25:05 -0000      1.1224
@@ -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,7 +4654,9 @@
              int count = SPECPDL_INDEX ();
              Lisp_Object args[5];
 
-             limit = font_range (pos, limit, FACE_FROM_ID (it->f, it->face_id),
+             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);