Mercurial > hg > xemacs-beta
comparison src/specifier.c @ 116:9f59509498e1 r20-1b10
Import from CVS: tag r20-1b10
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:23:06 +0200 |
parents | 6a378aca36af |
children | cca96a509cfe |
comparison
equal
deleted
inserted
replaced
115:f109f7dabbe2 | 116:9f59509498e1 |
---|---|
33 #include "device.h" | 33 #include "device.h" |
34 #include "frame.h" | 34 #include "frame.h" |
35 #include "opaque.h" | 35 #include "opaque.h" |
36 #include "specifier.h" | 36 #include "specifier.h" |
37 #include "window.h" | 37 #include "window.h" |
38 #include "glyphs.h" /* for DISP_TABLE_SIZE definition */ | |
38 | 39 |
39 Lisp_Object Qspecifierp; | 40 Lisp_Object Qspecifierp; |
40 Lisp_Object Qprepend, Qappend, Qremove_tag_set_prepend, Qremove_tag_set_append; | 41 Lisp_Object Qprepend, Qappend, Qremove_tag_set_prepend, Qremove_tag_set_append; |
41 Lisp_Object Qremove_locale, Qremove_locale_type, Qremove_all; | 42 Lisp_Object Qremove_locale, Qremove_locale_type, Qremove_all; |
42 Lisp_Object Qfallback; | 43 Lisp_Object Qfallback; |
2875 (object)) | 2876 (object)) |
2876 { | 2877 { |
2877 return (BOOLEAN_SPECIFIERP (object) ? Qt : Qnil); | 2878 return (BOOLEAN_SPECIFIERP (object) ? Qt : Qnil); |
2878 } | 2879 } |
2879 | 2880 |
2881 /************************************************************************/ | |
2882 /* Display table specifier type */ | |
2883 /************************************************************************/ | |
2884 | |
2885 DEFINE_SPECIFIER_TYPE (display_table); | |
2886 | |
2887 void | |
2888 display_table_validate(instantiator) | |
2889 Lisp_Object instantiator; | |
2890 { | |
2891 if (!NILP(instantiator) && | |
2892 (!VECTORP (instantiator) || | |
2893 XVECTOR (instantiator)->size != DISP_TABLE_SIZE)) | |
2894 dead_wrong_type_argument(display_table_specifier_methods->predicate_symbol, instantiator); | |
2895 return; | |
2896 } | |
2897 DEFUN ("display-table-specifier-p", Fdisplay_table_specifier_p, 1, 1, 0, /* | |
2898 Return non-nil if OBJECT is an display-table specifier. | |
2899 */ | |
2900 (object)) | |
2901 { | |
2902 return (DISPLAYTABLE_SPECIFIERP (object) ? Qt : Qnil); | |
2903 } | |
2904 | |
2880 | 2905 |
2881 /************************************************************************/ | 2906 /************************************************************************/ |
2882 /* Initialization */ | 2907 /* Initialization */ |
2883 /************************************************************************/ | 2908 /************************************************************************/ |
2884 | 2909 |
2975 SPECIFIER_HAS_METHOD (natnum, validate); | 3000 SPECIFIER_HAS_METHOD (natnum, validate); |
2976 | 3001 |
2977 INITIALIZE_SPECIFIER_TYPE (boolean, "boolean", "boolean-specifier-p"); | 3002 INITIALIZE_SPECIFIER_TYPE (boolean, "boolean", "boolean-specifier-p"); |
2978 | 3003 |
2979 SPECIFIER_HAS_METHOD (boolean, validate); | 3004 SPECIFIER_HAS_METHOD (boolean, validate); |
3005 | |
3006 INITIALIZE_SPECIFIER_TYPE (display_table, "display-table", | |
3007 "display-table-p"); | |
3008 | |
3009 SPECIFIER_HAS_METHOD (display_table, validate); | |
2980 } | 3010 } |
2981 | 3011 |
2982 void | 3012 void |
2983 vars_of_specifier (void) | 3013 vars_of_specifier (void) |
2984 { | 3014 { |