From: Kim F. Storm <storm@cua.dk>
Date: Sun, 28 Dec 2003 00:11:49 +0000 (+0000)
Subject: (Qimage): Remove extern (now in lisp.h).
X-Git-Tag: ttn-vms-21-2-B4~8140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82cf95a792459f8dd7a1118f47c1a1dbec962bc9;p=emacs.git

(Qimage): Remove extern (now in lisp.h).
(valid_image_p, parse_image_spec): Use IMAGEP macro.
---

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.  */)
 
 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 @@ valid_image_p (object)
 {
   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 @@ parse_image_spec (spec, keywords, nkeywords, type)
   int i;
   Lisp_Object plist;
 
-  if (!CONSP (spec) || !EQ (XCAR (spec), Qimage))
+  if (!IMAGEP (spec))
     return 0;
 
   plist = XCDR (spec);
diff --git a/src/w32fns.c b/src/w32fns.c
index d8572265bef..7bffea34a28 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6937,11 +6937,6 @@ DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0,
 
 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 @@ valid_image_p (object)
 {
   int valid_p = 0;
 
-  if (CONSP (object) && EQ (XCAR (object), Qimage))
+  if (IMAGEP (object))
     {
       Lisp_Object tem;
 
@@ -7123,7 +7118,7 @@ parse_image_spec (spec, keywords, nkeywords, type)
   int i;
   Lisp_Object plist;
 
-  if (!CONSP (spec) || !EQ (XCAR (spec), Qimage))
+  if (!IMAGEP (spec))
     return 0;
 
   plist = XCDR (spec);