[Emacs-diffs] trunk r114156: * src/eval.c (eval_sub): Only call Ffunction if necessary.

[Stefan Monnier]

------------------------------------------------------------
revno: 114156
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-09-06 10:28:05 -0400
message:
  * src/eval.c (eval_sub): Only call Ffunction if necessary.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/eval.c                     eval.c-20091113204419-o5vbwnq5f7feedwu-237

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-06 08:49:14 +0000
+++ b/src/ChangeLog     2013-09-06 14:28:05 +0000
@@ -1,3 +1,7 @@
+2013-09-06  Stefan Monnier  <address@hidden>
+
+       * eval.c (eval_sub): Only call Ffunction if necessary.
+
 2013-09-06  Dmitry Antipov  <address@hidden>
 
        Attempt to make redisplay more selective when changing cursor type.

=== modified file 'src/eval.c'
--- a/src/eval.c        2013-08-28 18:27:26 +0000
+++ b/src/eval.c        2013-09-06 14:28:05 +0000
@@ -2146,11 +2146,10 @@
 
   /* Optimize for no indirection.  */
   fun = original_fun;
-  if (SYMBOLP (fun) && !NILP (fun)
-      && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
-    fun = indirect_function (fun);
-  else
+  if (!SYMBOLP (fun))
     fun = Ffunction (Fcons (fun, Qnil));
+  else if (!NILP (fun) && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
+    fun = indirect_function (fun);
 
   if (SUBRP (fun))
     {