From f0870da2bb5eee848a5561fb58b2ec3a63861052 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Tue, 6 Dec 2016 21:38:32 -0800
Subject: 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.
---
 src/bytecode.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/bytecode.c')

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;
 	  }
-- 
cgit v1.2.1