diff src/glyphs.h @ 278:90d73dddcdc4 r21-0b37

Import from CVS: tag r21-0b37
author cvs
date Mon, 13 Aug 2007 10:31:29 +0200
parents 6330739388db
children 7df0dd720c89
line wrap: on
line diff
--- a/src/glyphs.h	Mon Aug 13 10:30:38 2007 +0200
+++ b/src/glyphs.h	Mon Aug 13 10:31:29 2007 +0200
@@ -27,6 +27,13 @@
 #include "specifier.h"
 
 extern Lisp_Object Qxpm;
+#ifdef HAVE_XPM
+extern Lisp_Object Q_color_symbols;
+Lisp_Object evaluate_xpm_color_symbols (void);
+#endif
+
+DOESNT_RETURN signal_image_error (CONST char *, Lisp_Object);
+DOESNT_RETURN signal_image_error_2 (CONST char *, Lisp_Object, Lisp_Object);
 
 /************************************************************************/
 /*			Image Instantiators				*/
@@ -187,6 +194,13 @@
 Lisp_Object find_keyword_in_vector_or_given (Lisp_Object vector,
 					     Lisp_Object keyword,
 					     Lisp_Object default_);
+Lisp_Object simple_image_type_normalize (Lisp_Object inst, 
+					 Lisp_Object console_type,
+					 Lisp_Object image_type_tag);
+Lisp_Object potential_pixmap_file_instantiator (Lisp_Object instantiator,
+						Lisp_Object file_keyword,
+						Lisp_Object data_keyword,
+						Lisp_Object console_type);
 void check_valid_string (Lisp_Object data);
 void check_valid_int (Lisp_Object data);
 DECLARE_DOESNT_RETURN (incompatible_image_types (Lisp_Object instantiator,