From 15aa58c18e557ead24010b7c9f78bd94d5579cf8 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 28 Dec 2003 00:13:10 +0000 Subject: [PATCH] (x_set_mouse_color): Remove bogus x_check_errors call. (Qimage): Remove extern (now in lisp.h). (valid_image_p, parse_image_spec): Use IMAGEP macro. --- src/xfns.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index cd50cbbc919..e940b16eba1 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1300,7 +1300,6 @@ x_set_mouse_color (f, arg, oldval) hourglass_cursor = XCreateFontCursor (dpy, XC_watch); x_check_errors (dpy, "bad hourglass pointer cursor: %s"); - x_check_errors (dpy, "bad nontext pointer cursor: %s"); if (!NILP (Vx_mode_pointer_shape)) { CHECK_NUMBER (Vx_mode_pointer_shape); @@ -4416,11 +4415,6 @@ the excessive values are ignored. */) 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; @@ -4500,7 +4494,7 @@ valid_image_p (object) { int valid_p = 0; - if (CONSP (object) && EQ (XCAR (object), Qimage)) + if (IMAGEP (object)) { Lisp_Object tem; @@ -4602,7 +4596,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); -- 2.39.2