From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 13 Mar 2009 16:14:20 +0000 (+0000)
Subject: (Ffontset_info): YAILOM (Yet another int/Lisp_Object mixup).
X-Git-Tag: emacs-pretest-23.0.92~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=348db3dd5f9cb97bc9b0c6e00e9b2e0b45a9925b;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e17edb6da97..71c7fa01fbd 100644
--- 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 9438c2379a4..47f99c59d2c 100644
--- 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;
     }