Mercurial > emacs
changeset 9143:069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
type test macros.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Tue, 27 Sep 1994 03:15:02 +0000 |
| parents | d67be35351e5 |
| children | 0e29f6a4fe7c |
| files | src/disptab.h |
| diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/disptab.h Tue Sep 27 03:13:50 1994 +0000 +++ b/src/disptab.h Tue Sep 27 03:15:02 1994 +0000 @@ -40,25 +40,21 @@ /* Return the current length of the GLYPH table, or 0 if the table isn't currently valid. */ #define GLYPH_TABLE_LENGTH \ - ((XTYPE (Vglyph_table) == Lisp_Vector) \ - ? XVECTOR (Vglyph_table)->size : 0) + ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0) /* Return the current base (for indexing) of the GLYPH table, or 0 if the table isn't currently valid. */ #define GLYPH_TABLE_BASE \ - ((XTYPE (Vglyph_table) == Lisp_Vector) \ - ? XVECTOR (Vglyph_table)->contents : 0) + ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->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 character with code G. Return zero if G has a string in the table. */ -#define GLYPH_SIMPLE_P(base,len,g) \ - ((g) >= (len) || XTYPE (base[g]) != Lisp_String) +#define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g])) /* Given BASE and LEN returned by the two previous macros, return nonzero if GLYPH code G is aliased to a different code. */ -#define GLYPH_ALIAS_P(base,len,g) \ - ((g) < (len) && XTYPE (base[g]) == Lisp_Int) +#define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g])) /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1, return the alias for G. */