/* Things for GLYPHS and glyph tables.
- Copyright (C) 1993, 2001-2011 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
/* Return the current length of the GLYPH table,
or 0 if the table isn't currently valid. */
#define GLYPH_TABLE_LENGTH \
- ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0)
+ ((VECTORP (Vglyph_table)) ? ASIZE (Vglyph_table) : 0)
/* Return the current base (for indexing) of the GLYPH table,
or 0 if the table isn't currently valid. */
#define GLYPH_TABLE_BASE \
- ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0)
+ ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->u.contents : 0)
/* Given BASE and LEN returned by the two previous macros,
return nonzero if the GLYPH code G should be output as a single
#define SET_GLYPH_FROM_CHAR(glyph, c) \
SET_GLYPH (glyph, c, DEFAULT_FACE_ID)
-