Mercurial > hg > xemacs-beta
diff src/objects.h @ 2:ac2d302a0011 r19-15b2
Import from CVS: tag r19-15b2
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:46:35 +0200 |
| parents | 376386a54a3c |
| children | 0293115a14e9 |
line wrap: on
line diff
--- a/src/objects.h Mon Aug 13 08:45:53 2007 +0200 +++ b/src/objects.h Mon Aug 13 08:46:35 2007 +0200 @@ -139,7 +139,7 @@ void *data; }; -#define COLOR_INSTANCE_NAME(c) ((c)->name) +#define COLOR_INSTANCE_NAME(c) ((c)->name) #define COLOR_INSTANCE_DEVICE(c) ((c)->device) /**************************************************************************** @@ -154,15 +154,10 @@ #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) -int font_spec_matches_charset (struct device *d, Lisp_Object charset, - CONST Bufbyte *nonreloc, - Lisp_Object reloc, Bytecount offset, - Bytecount length); - Lisp_Object Fmake_font_instance (Lisp_Object name, Lisp_Object device, Lisp_Object no_error); -Lisp_Object Ffont_instance_p (Lisp_Object obj); -Lisp_Object Ffont_instance_name (Lisp_Object obj); +Lisp_Object Ffont_instance_p (Lisp_Object obj); +Lisp_Object Ffont_instance_name (Lisp_Object obj); Lisp_Object Ffont_instance_truename (Lisp_Object obj); extern Lisp_Object Vthe_null_font_instance; @@ -183,12 +178,11 @@ void *data; }; -#define FONT_INSTANCE_NAME(f) ((f)->name) -#define FONT_INSTANCE_DEVICE(f) ((f)->device) - -#define FONT_INSTANCE_WIDTH(f) ((f)->width) -#define FONT_INSTANCE_HEIGHT(f) ((f)->height) -#define FONT_INSTANCE_ASCENT(f) ((f)->ascent) +#define FONT_INSTANCE_NAME(f) ((f)->name) +#define FONT_INSTANCE_DEVICE(f) ((f)->device) +#define FONT_INSTANCE_ASCENT(f) ((f)->ascent) #define FONT_INSTANCE_DESCENT(f) ((f)->descent) +#define FONT_INSTANCE_WIDTH(f) ((f)->width) +#define FONT_INSTANCE_HEIGHT(f) ((f)->height) #endif /* _XEMACS_OBJECTS_H_ */