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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/08/18 12:06:34

Index: fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- fontset.c   27 Jul 2008 18:24:41 -0000      1.142
+++ fontset.c   18 Aug 2008 12:06:33 -0000      1.143
@@ -872,7 +872,7 @@
      int c, pos;
      Lisp_Object object;
 {
-  Lisp_Object fontset, rfont_def;
+  Lisp_Object fontset, rfont_def, charset;
   int face_id;
   int id;
 
@@ -884,11 +884,12 @@
   xassert (!BASE_FONTSET_P (fontset));
 
   if (pos < 0)
+    {
     id = -1;
+      charset = Qnil;
+    }
   else
     {
-      Lisp_Object charset;
-
       charset = Fget_char_property (make_number (pos), Qcharset, object);
       if (NILP (charset))
        id = -1;
@@ -903,6 +904,7 @@
        }
     }
 
+  font_add_log ("finding a font for", Fcons (make_number (c), charset), Qnil);
   rfont_def = fontset_font (fontset, c, face, id);
   if (VECTORP (rfont_def))
     {