comparison src/w32fns.c @ 53332:21301d0e0505

(Qimage): Remove extern (now in lisp.h). (valid_image_p, parse_image_spec): Use IMAGEP macro.
author Kim F. Storm <storm@cua.dk>
date Sun, 28 Dec 2003 00:11:49 +0000
parents 8787289602d1
children 5456cd83c404
comparison
equal deleted inserted replaced
53331:db670c1b5944 53332:21301d0e0505
6935 /* List of supported image types. Use define_image_type to add new 6935 /* List of supported image types. Use define_image_type to add new
6936 types. Use lookup_image_type to find a type for a given symbol. */ 6936 types. Use lookup_image_type to find a type for a given symbol. */
6937 6937
6938 static struct image_type *image_types; 6938 static struct image_type *image_types;
6939 6939
6940 /* The symbol `image' which is the car of the lists used to represent
6941 images in Lisp. */
6942
6943 extern Lisp_Object Qimage;
6944
6945 /* The symbol `xbm' which is used as the type symbol for XBM images. */ 6940 /* The symbol `xbm' which is used as the type symbol for XBM images. */
6946 6941
6947 Lisp_Object Qxbm; 6942 Lisp_Object Qxbm;
6948 6943
6949 /* Keywords. */ 6944 /* Keywords. */
7019 valid_image_p (object) 7014 valid_image_p (object)
7020 Lisp_Object object; 7015 Lisp_Object object;
7021 { 7016 {
7022 int valid_p = 0; 7017 int valid_p = 0;
7023 7018
7024 if (CONSP (object) && EQ (XCAR (object), Qimage)) 7019 if (IMAGEP (object))
7025 { 7020 {
7026 Lisp_Object tem; 7021 Lisp_Object tem;
7027 7022
7028 for (tem = XCDR (object); CONSP (tem); tem = XCDR (tem)) 7023 for (tem = XCDR (object); CONSP (tem); tem = XCDR (tem))
7029 if (EQ (XCAR (tem), QCtype)) 7024 if (EQ (XCAR (tem), QCtype))
7121 Lisp_Object type; 7116 Lisp_Object type;
7122 { 7117 {
7123 int i; 7118 int i;
7124 Lisp_Object plist; 7119 Lisp_Object plist;
7125 7120
7126 if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) 7121 if (!IMAGEP (spec))
7127 return 0; 7122 return 0;
7128 7123
7129 plist = XCDR (spec); 7124 plist = XCDR (spec);
7130 while (CONSP (plist)) 7125 while (CONSP (plist))
7131 { 7126 {