From e1a14cdc74e1061adbc227db18cc8a191fa50755 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 11 Mar 2004 11:40:12 +0000 Subject: [PATCH] Include "intervals.h". (fontset_face): Fix comparing of Lisp_Objects. (free_face_fontset): Fix Lisp_Object/int mixup. (new_fontset_from_font_name): Likewise. --- src/fontset.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/fontset.c b/src/fontset.c index 43ff5372add..cab0124e279 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -39,6 +39,7 @@ Boston, MA 02111-1307, USA. */ #include "keyboard.h" #include "frame.h" #include "dispextern.h" +#include "intervals.h" #include "fontset.h" #include "window.h" @@ -674,7 +675,7 @@ fontset_face (fontset, c, face, id) } try_fallback: - if (vec != FONTSET_FALLBACK (fontset)) + if (! EQ (vec, FONTSET_FALLBACK (fontset))) { vec = FONTSET_FALLBACK (fontset); if (VECTORP (vec)) @@ -827,7 +828,7 @@ free_face_fontset (f, face) 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 @@ new_fontset_from_font_name (Lisp_Object fontname) 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));