(Ffontset_info): YAILOM (Yet another int/Lisp_Object mixup).

diff --git a/src/ChangeLog b/src/ChangeLog
index e17edb6da978717c0903010ba25c95be93fcf4de..71c7fa01fbdf88f6e98a2f6ede0764dd08363cee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
 2009-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * fontset.c (fontset_from_font): YAILOM (Yet another int/Lisp_Object
-       mixup).
+       * fontset.c (fontset_from_font, Ffontset_info): YAILOM (Yet another
+       int/Lisp_Object mixup).
 
 2009-03-13  Kenichi Handa  <handa@m17n.org>
 

diff --git a/src/fontset.c b/src/fontset.c
index 9438c2379a426a4b3a7283a84fca07699a46742b..47f99c59d2c70d913de8e54b62ac2d6172ed041d 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1965,7 +1965,7 @@ format is the same as above.  */)
 
   tables[0] = Fmake_char_table (Qfontset_info, Qnil);
   fontsets[0] = fontset;
-  if (fontset != Vdefault_fontset)
+  if (!EQ (fontset, Vdefault_fontset))
     {
       tables[1] = Fmake_char_table (Qnil, Qnil);
       XCHAR_TABLE (tables[0])->extras[0] = tables[1];
@@ -2042,7 +2042,7 @@ format is the same as above.  */)
            }
          c = to + 1;
        }
-      if (fontset == Vdefault_fontset)
+      if (EQ (fontset, Vdefault_fontset))
        break;
     }