# HG changeset patch # User Kim F. Storm # Date 1152798224 0 # Node ID dcd566ed4e9bcd252101301543170b537a91f08f # Parent a0954041b6958b4a7c7f34ab9ccdf9522267d1a8 (Findirect_function): Optimize for no indirection. diff -r a0954041b695 -r dcd566ed4e9b src/data.c --- a/src/data.c Thu Jul 13 13:43:38 2006 +0000 +++ b/src/data.c Thu Jul 13 13:43:44 2006 +0000 @@ -1913,13 +1913,18 @@ { Lisp_Object result; - result = indirect_function (object); - - if (EQ (result, Qunbound)) - return (NILP (noerror) - ? Fsignal (Qvoid_function, Fcons (object, Qnil)) - : Qnil); - return result; + /* Optimize for no indirection. */ + result = object; + if (SYMBOLP (result) && !EQ (result, Qunbound) + && (result = XSYMBOL (result)->function, SYMBOLP (result))) + result = indirect_function (result); + if (!EQ (result, Qunbound)) + return result; + + if (NILP (noerror)) + Fsignal (Qvoid_function, Fcons (object, Qnil)); + + return Qnil; } /* Extract and set vector and string elements */