Move imagep in image.c from the debugging section

* lisp/simple.el (imagep): Remove.
* src/image.c (Fimagep): Always define.

diff --git a/lisp/simple.el b/lisp/simple.el
index 85c43df2f51adf14408108ea533c8ad463818b1e..60f2ad345289d9fa759c48c53c468ec87db23518 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -10717,10 +10717,6 @@ If the buffer doesn't exist, create it first."
   (plist-put plist prop val #'equal))
 \f
 
-(defun imagep (object)
-  "Return non-nil if OBJECT is an image."
-  (and (consp object) (eq (car object) 'image)))
-
 (provide 'simple)
 
 ;;; simple.el ends here

diff --git a/src/image.c b/src/image.c
index 551da716434fb6ffb75adbba4f6627e2da6ef90e..1e323ba66a012eecba7c19eb5fc99a19f97ec5bf 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -11838,9 +11838,6 @@ x_kill_gs_process (Pixmap pixmap, struct frame *f)
 /***********************************************************************
                                Tests
  ***********************************************************************/
-
-#ifdef GLYPH_DEBUG
-
 DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0,
        doc: /* Value is non-nil if SPEC is a valid image specification.  */)
   (Lisp_Object spec)
@@ -11848,6 +11845,7 @@ DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0,
   return valid_image_p (spec) ? Qt : Qnil;
 }
 
+#ifdef GLYPH_DEBUG
 
 DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0,
        doc: /* */)
@@ -12240,9 +12238,9 @@ non-numeric, there is no explicit limit on the size of images.  */);
   defsubr (&Simage_mask_p);
   defsubr (&Simage_metadata);
   defsubr (&Simage_cache_size);
+  defsubr (&Simagep);
 
 #ifdef GLYPH_DEBUG
-  defsubr (&Simagep);
   defsubr (&Slookup_image);
 #endif