Simplify FUNCTIONP implementation

* src/bytecode.c (exec_byte_code):
* src/image.c (parse_image_spec):
Prefer FUNCTIONP (x) to !NILP (Ffunctionp (x)).
* src/eval.c (FUNCTIONP): Move here ...
* src/lisp.h: ... from here.  No longer inline, as that
bloats the text and does not help speed (at least on my platform).
(functionp): Remove this name, since callers use FUNCTIONP.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/image.c b/src/image.c
index a87dc4d4737..89572b87647 100644
--- a/src/image.c
+++ b/src/image.c
@@ -793,7 +793,7 @@ parse_image_spec (Lisp_Object spec, struct image_keyword *keywords,
 
         case IMAGE_FUNCTION_VALUE:
           value = indirect_function (value);
-          if (!NILP (Ffunctionp (value)))
+          if (FUNCTIONP (value))
             break;
           return 0;