comparison src/glyphs.c @ 269:b2472a1930f2 r20-5b33

Import from CVS: tag r20-5b33
author cvs
date Mon, 13 Aug 2007 10:27:19 +0200
parents 83b3d10dcba9
children c5d627a313b1
comparison
equal deleted inserted replaced
268:6ced69ccd85f 269:b2472a1930f2
35 #include "frame.h" 35 #include "frame.h"
36 #include "glyphs.h" 36 #include "glyphs.h"
37 #include "objects.h" 37 #include "objects.h"
38 #include "redisplay.h" 38 #include "redisplay.h"
39 #include "window.h" 39 #include "window.h"
40
41 Lisp_Object Qimage_conversion_error;
40 42
41 Lisp_Object Qglyphp, Qcontrib_p, Qbaseline; 43 Lisp_Object Qglyphp, Qcontrib_p, Qbaseline;
42 44
43 Lisp_Object Qbuffer_glyph_p, Qpointer_glyph_p, Qicon_glyph_p; 45 Lisp_Object Qbuffer_glyph_p, Qpointer_glyph_p, Qicon_glyph_p;
44 46
2756 DEFSUBR (Fglyph_height); 2758 DEFSUBR (Fglyph_height);
2757 2759
2758 /* Qbuffer defined in general.c. */ 2760 /* Qbuffer defined in general.c. */
2759 /* Qpointer defined above */ 2761 /* Qpointer defined above */
2760 defsymbol (&Qicon, "icon"); 2762 defsymbol (&Qicon, "icon");
2763
2764 /* Errors */
2765 deferror (&Qimage_conversion_error,
2766 "image-conversion-error",
2767 "image-conversion error", Qio_error);
2768
2761 } 2769 }
2762 2770
2763 void 2771 void
2764 specifier_type_create_image (void) 2772 specifier_type_create_image (void)
2765 { 2773 {