comparison src/objects.h @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 98af8a976fc3
children b5df3737028a
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
28 28
29 /**************************************************************************** 29 /****************************************************************************
30 * Color Instance Object * 30 * Color Instance Object *
31 ****************************************************************************/ 31 ****************************************************************************/
32 32
33 DECLARE_LRECORD (color_instance, Lisp_Color_Instance); 33 DECLARE_LISP_OBJECT (color_instance, Lisp_Color_Instance);
34 #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance) 34 #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance)
35 #define wrap_color_instance(p) wrap_record (p, color_instance) 35 #define wrap_color_instance(p) wrap_record (p, color_instance)
36 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) 36 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance)
37 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) 37 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance)
38 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) 38 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance)
49 ****************************************************************************/ 49 ****************************************************************************/
50 50
51 void initialize_charset_font_caches (struct device *d); 51 void initialize_charset_font_caches (struct device *d);
52 void invalidate_charset_font_caches (Lisp_Object charset); 52 void invalidate_charset_font_caches (Lisp_Object charset);
53 53
54 DECLARE_LRECORD (font_instance, Lisp_Font_Instance); 54 DECLARE_LISP_OBJECT (font_instance, Lisp_Font_Instance);
55 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance) 55 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance)
56 #define wrap_font_instance(p) wrap_record (p, font_instance) 56 #define wrap_font_instance(p) wrap_record (p, font_instance)
57 #define FONT_INSTANCEP(x) RECORDP (x, font_instance) 57 #define FONT_INSTANCEP(x) RECORDP (x, font_instance)
58 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) 58 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance)
59 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) 59 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance)
60 60
61 EXFUN (Fmake_font_instance, 3); 61 EXFUN (Fmake_font_instance, 4);
62 EXFUN (Ffont_instance_name, 1); 62 EXFUN (Ffont_instance_name, 1);
63 EXFUN (Ffont_instance_p, 1); 63 EXFUN (Ffont_instance_p, 1);
64 EXFUN (Ffont_instance_truename, 1); 64 EXFUN (Ffont_instance_truename, 1);
65 EXFUN (Ffont_instance_charset, 1);
65 66
66 extern Lisp_Object Vthe_null_font_instance; 67 extern Lisp_Object Vthe_null_font_instance;
67 68
68 void set_font_attached_to (Lisp_Object obj, Lisp_Object face, 69 void set_font_attached_to (Lisp_Object obj, Lisp_Object face,
69 Lisp_Object property); 70 Lisp_Object property);
73 *****************************************************************************/ 74 *****************************************************************************/
74 75
75 void set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face, 76 void set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face,
76 Lisp_Object property); 77 Lisp_Object property);
77 78
79 /* Defined in search.c, used in mule-charset.c; slightly ugly to declare it
80 here, but oh well. */
81 EXFUN (Fregexp_quote, 1);
82
78 #endif /* INCLUDED_objects_h_ */ 83 #endif /* INCLUDED_objects_h_ */