Mercurial > emacs
changeset 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 | db670c1b5944 |
| children | c23cf5520cd9 |
| files | src/macfns.c src/w32fns.c |
| diffstat | 2 files changed, 4 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macfns.c Sun Dec 28 00:11:03 2003 +0000 +++ b/src/macfns.c Sun Dec 28 00:11:49 2003 +0000 @@ -3460,11 +3460,6 @@ static struct image_type *image_types; -/* The symbol `image' which is the car of the lists used to represent - images in Lisp. */ - -extern Lisp_Object Qimage; - /* The symbol `xbm' which is used as the type symbol for XBM images. */ Lisp_Object Qxbm; @@ -3543,7 +3538,7 @@ { int valid_p = 0; - if (CONSP (object) && EQ (XCAR (object), Qimage)) + if (IMAGEP (object)) { Lisp_Object symbol = Fplist_get (XCDR (object), QCtype); struct image_type *type = lookup_image_type (symbol); @@ -3633,7 +3628,7 @@ int i; Lisp_Object plist; - if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) + if (!IMAGEP (spec)) return 0; plist = XCDR (spec);
--- a/src/w32fns.c Sun Dec 28 00:11:03 2003 +0000 +++ b/src/w32fns.c Sun Dec 28 00:11:49 2003 +0000 @@ -6937,11 +6937,6 @@ static struct image_type *image_types; -/* The symbol `image' which is the car of the lists used to represent - images in Lisp. */ - -extern Lisp_Object Qimage; - /* The symbol `xbm' which is used as the type symbol for XBM images. */ Lisp_Object Qxbm; @@ -7021,7 +7016,7 @@ { int valid_p = 0; - if (CONSP (object) && EQ (XCAR (object), Qimage)) + if (IMAGEP (object)) { Lisp_Object tem; @@ -7123,7 +7118,7 @@ int i; Lisp_Object plist; - if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) + if (!IMAGEP (spec)) return 0; plist = XCDR (spec);