*** empty log message ***

3 files changed, 24 insertions, 2 deletions

diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 5bc4ad99299..be1caddfd20 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -1,3 +1,7 @@
+2008-01-11  Kenichi Handa  <handa@ni.aist.go.jp>
+
+        * descr-text.el (describe-char-display): Fix previous change.
+
 2008-01-09  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * ps-print.el: Some face attributes (like :strike-through) was not
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index a9b7bc98316..bbf9ad96f27 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,18 @@
+2008-01-14  Kenichi Handa  <handa@ni.aist.go.jp>
+
+        * font.c (font_find_for_lface): Fix the handling of the return
+        value of  font_has_char.
+        (Ffont_shape_text): Fix previous change.
+
+        * fontset.c (FONTSET_REF_AND_RANGE): Delete it.
+        (fontset_ref_and_range): Delete it.
+        (fontset_find_font): Call char_table_ref_and_range instead of
+        FONTSET_REF_AND_RANGE.
+        (make_fontset): Don't setup font groups of Latin here.
+        (Fset_fontset_font): Don't overwrite the setting of FONTSET_ASCII.
+        (new_fontset_from_font): Make the specified font the default for
+        all Latin characters.
+
 2008-01-10  Kenichi Handa  <handa@ni.aist.go.jp>
 
         * xfaces.c (Finternal_set_lisp_face_attribute): Check if the frame
diff --git a/src/font.c b/src/font.c
index 349862b6c2b..f9097d1f064 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2699,7 +2699,7 @@ font_find_for_lface (f, lface, spec, c)
 
       if (result > 0)
         return AREF (entities, i);
-      if (result <= 0)
+      if (result == 0)
         continue;
       font_object = font_open_for_lface (f, AREF (entities, i), lface, spec);
       if (NILP (font_object))
@@ -3577,9 +3577,12 @@ FONT-OBJECT.  */)
       for (i = 0; i < len; i++)
         {
           Lisp_Object g = LGSTRING_GLYPH (gstring, i);
-          unsigned code = LGLYPH_CODE (g);
+          unsigned code;
           struct font_metrics metrics;
 
+          if (NILP (g))
+            break;
+          code = LGLYPH_CODE (g);
           if (font->driver->text_extents (font, &code, 1, &metrics) == 0)
             {
               Lisp_Object gstr = Ffont_make_gstring (font_object,