mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Include "intervals.h".

Browse source 
(fontset_face): Fix comparing of Lisp_Objects.
(free_face_fontset): Fix Lisp_Object/int mixup.
(new_fontset_from_font_name): Likewise.
This commit is contained in:
Kenichi Handa 2004-03-11 11:40:12 +00:00
parent 30d56493d5
commit e1a14cdc74
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/fontset.c
View file

@ -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));