diff options
Diffstat (limited to 'src/macfns.c')
| -rw-r--r-- | src/macfns.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/macfns.c b/src/macfns.c index 1634809ca3e..0f87556fb1e 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -3460,11 +3460,6 @@ If DISPLAY is omitted or nil, that stands for the selected frame's display. */) | |||
| 3460 | 3460 | ||
| 3461 | static struct image_type *image_types; | 3461 | static struct image_type *image_types; |
| 3462 | 3462 | ||
| 3463 | /* The symbol `image' which is the car of the lists used to represent | ||
| 3464 | images in Lisp. */ | ||
| 3465 | |||
| 3466 | extern Lisp_Object Qimage; | ||
| 3467 | |||
| 3468 | /* The symbol `xbm' which is used as the type symbol for XBM images. */ | 3463 | /* The symbol `xbm' which is used as the type symbol for XBM images. */ |
| 3469 | 3464 | ||
| 3470 | Lisp_Object Qxbm; | 3465 | Lisp_Object Qxbm; |
| @@ -3543,7 +3538,7 @@ valid_image_p (object) | |||
| 3543 | { | 3538 | { |
| 3544 | int valid_p = 0; | 3539 | int valid_p = 0; |
| 3545 | 3540 | ||
| 3546 | if (CONSP (object) && EQ (XCAR (object), Qimage)) | 3541 | if (IMAGEP (object)) |
| 3547 | { | 3542 | { |
| 3548 | Lisp_Object symbol = Fplist_get (XCDR (object), QCtype); | 3543 | Lisp_Object symbol = Fplist_get (XCDR (object), QCtype); |
| 3549 | struct image_type *type = lookup_image_type (symbol); | 3544 | struct image_type *type = lookup_image_type (symbol); |
| @@ -3633,7 +3628,7 @@ parse_image_spec (spec, keywords, nkeywords, type) | |||
| 3633 | int i; | 3628 | int i; |
| 3634 | Lisp_Object plist; | 3629 | Lisp_Object plist; |
| 3635 | 3630 | ||
| 3636 | if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) | 3631 | if (!IMAGEP (spec)) |
| 3637 | return 0; | 3632 | return 0; |
| 3638 | 3633 | ||
| 3639 | plist = XCDR (spec); | 3634 | plist = XCDR (spec); |