Mercurial > emacs

changeset 89865:d2b1cc2ef7f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include "intervals.h". (fontset_face): Fix comparing of Lisp_Objects. (free_face_fontset): Fix Lisp_Object/int mixup. (new_fontset_from_font_name): Likewise.
author Kenichi Handa <handa@m17n.org>
date Thu, 11 Mar 2004 11:40:12 +0000
parents 4ecedb099c92
children 70daf4dac8c0
files src/fontset.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Thu Mar 11 11:38:27 2004 +0000
+++ b/src/fontset.c	Thu Mar 11 11:40:12 2004 +0000
@@ -39,6 +39,7 @@
 #include "keyboard.h"
 #include "frame.h"
 #include "dispextern.h"
+#include "intervals.h"
 #include "fontset.h"
 #include "window.h"
 
@@ -674,7 +675,7 @@
     }
 
  try_fallback:
-  if (vec != FONTSET_FALLBACK (fontset))
+  if (! EQ (vec, FONTSET_FALLBACK (fontset)))
     {
       vec = FONTSET_FALLBACK (fontset);
       if (VECTORP (vec))
@@ -827,7 +828,7 @@
     next_fontset_id = face->fontset;
   if (! NILP (FONTSET_DEFAULT (fontset)))
     {
-      int id = FONTSET_ID (FONTSET_DEFAULT (fontset));
+      int id = XINT (FONTSET_ID (FONTSET_DEFAULT (fontset)));
       
       fontset = AREF (Vfontset_table, id);
       xassert (!NILP (fontset) && ! BASE_FONTSET_P (fontset));
@@ -1579,7 +1580,7 @@
   else
     {
       char temp[20];
-      int len = Flength (auto_fontset_alist);
+      int len = XINT (Flength (auto_fontset_alist));
 
       sprintf (temp, "auto%d", len);
       ASET (vec, 13, build_string (temp));