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, 2 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 868c0148d30..71ecdbf2cc0 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -809,8 +809,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           {
             Lisp_Object handler = POP;
             /* Support for a function here is new in 24.4.  */
-            record_unwind_protect ((NILP (Ffunctionp (handler))
-                                    ? unwind_body : bcall0),
+            record_unwind_protect (FUNCTIONP (handler) ? bcall0 : unwind_body,
                                    handler);
             NEXT;
           }