From 95eb82644d348c59af9f4ec10ad315bf5e498353 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Wed, 20 Nov 2019 21:51:11 +0100 Subject: [PATCH] fix symbol_subr + better naming --- src/comp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/comp.c b/src/comp.c index 3e5f8f29901..fc8ec406987 100644 --- a/src/comp.c +++ b/src/comp.c @@ -228,15 +228,15 @@ bcall0 (Lisp_Object f) static Lisp_Object symbol_subr (Lisp_Object symbol) { - Lisp_Object subr = Fsymbol_function (symbol); + Lisp_Object maybe_subr = Fsymbol_function (symbol); - if (SUBRP (subr)) - return subr; + if (SUBRP (maybe_subr)) + return maybe_subr; - if (!NILP (CALL1I (ad-has-any-advice, symbol))) - subr = CALL1I (ad-get-orig-definition, symbol); + if (!NILP (CALL1I (advice--p, maybe_subr))) + maybe_subr = CALL1I (ad-get-orig-definition, symbol); - return SUBRP (subr) ? subr : Qnil; + return SUBRP (maybe_subr) ? maybe_subr : Qnil; } static gcc_jit_field * -- 2.39.5