Obey lexical-binding in interactive evaluation commands.

* lisp/emacs-lisp/edebug.el (edebug-eval-defun, edebug-eval):
* lisp/emacs-lisp/lisp-mode.el (eval-last-sexp-1, eval-defun-1):
* lisp/ielm.el (ielm-eval-input):
* lisp/simple.el (eval-expression): Use new eval arg to obey lexical-binding.

* src/eval.c (Feval): Add `lexical' argument.  Adjust callers.
(Ffuncall, eval_sub): Avoid goto.

1 files changed, 132 insertions, 135 deletions

diff --git a/src/eval.c b/src/eval.c
index 485ba00c1e4..7104a8a8396 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2311,12 +2311,14 @@ do_autoload (Lisp_Object fundef, Lisp_Object funname)
 }
 
 
-DEFUN ("eval", Feval, Seval, 1, 1, 0,
-       doc: /* Evaluate FORM and return its value.  */)
-  (Lisp_Object form)
+DEFUN ("eval", Feval, Seval, 1, 2, 0,
+       doc: /* Evaluate FORM and return its value.
+If LEXICAL is t, evaluate using lexical scoping.  */)
+  (Lisp_Object form, Lisp_Object lexical)
 {
   int count = SPECPDL_INDEX ();
-  specbind (Qinternal_interpreter_environment, Qnil);
+  specbind (Qinternal_interpreter_environment,
+            NILP (lexical) ? Qnil : Fcons (Qt, Qnil));
   return unbind_to (count, eval_sub (form));
 }
 
@@ -2414,10 +2416,8 @@ eval_sub (Lisp_Object form)
         {
           backtrace.evalargs = 0;
           val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
-          goto done;
         }
-
-      if (XSUBR (fun)->max_args == MANY)
+      else if (XSUBR (fun)->max_args == MANY)
         {
           /* Pass a vector of evaluated arguments */
           Lisp_Object *vals;
@@ -2443,73 +2443,74 @@ eval_sub (Lisp_Object form)
           val = (XSUBR (fun)->function.aMANY) (XINT (numargs), vals);
           UNGCPRO;
           SAFE_FREE ();
-          goto done;
         }
-
-      GCPRO3 (args_left, fun, fun);
-      gcpro3.var = argvals;
-      gcpro3.nvars = 0;
-
-      maxargs = XSUBR (fun)->max_args;
-      for (i = 0; i < maxargs; args_left = Fcdr (args_left))
+      else
         {
-          argvals[i] = eval_sub (Fcar (args_left));
-          gcpro3.nvars = ++i;
-        }
-
-      UNGCPRO;
+          GCPRO3 (args_left, fun, fun);
+          gcpro3.var = argvals;
+          gcpro3.nvars = 0;
+          
+          maxargs = XSUBR (fun)->max_args;
+          for (i = 0; i < maxargs; args_left = Fcdr (args_left))
+            {
+              argvals[i] = eval_sub (Fcar (args_left));
+              gcpro3.nvars = ++i;
+            }
+          
+          UNGCPRO;
 
-      backtrace.args = argvals;
-      backtrace.nargs = XINT (numargs);
+          backtrace.args = argvals;
+          backtrace.nargs = XINT (numargs);
 
-      switch (i)
-        {
-        case 0:
-          val = (XSUBR (fun)->function.a0) ();
-          goto done;
-        case 1:
-          val = (XSUBR (fun)->function.a1) (argvals[0]);
-          goto done;
-        case 2:
-          val = (XSUBR (fun)->function.a2) (argvals[0], argvals[1]);
-          goto done;
-        case 3:
-          val = (XSUBR (fun)->function.a3) (argvals[0], argvals[1],
-                                            argvals[2]);
-          goto done;
-        case 4:
-          val = (XSUBR (fun)->function.a4) (argvals[0], argvals[1],
-                                            argvals[2], argvals[3]);
-          goto done;
-        case 5:
-          val = (XSUBR (fun)->function.a5) (argvals[0], argvals[1], argvals[2],
-                                            argvals[3], argvals[4]);
-          goto done;
-        case 6:
-          val = (XSUBR (fun)->function.a6) (argvals[0], argvals[1], argvals[2],
-                                            argvals[3], argvals[4], argvals[5]);
-          goto done;
-        case 7:
-          val = (XSUBR (fun)->function.a7) (argvals[0], argvals[1], argvals[2],
-                                            argvals[3], argvals[4], argvals[5],
-                                            argvals[6]);
-          goto done;
-
-        case 8:
-          val = (XSUBR (fun)->function.a8) (argvals[0], argvals[1], argvals[2],
-                                            argvals[3], argvals[4], argvals[5],
-                                            argvals[6], argvals[7]);
-          goto done;
-
-        default:
-          /* Someone has created a subr that takes more arguments than
-             is supported by this code.  We need to either rewrite the
-             subr to use a different argument protocol, or add more
-             cases to this switch.  */
-          abort ();
+          switch (i)
+            {
+            case 0:
+              val = (XSUBR (fun)->function.a0) ();
+              break;
+            case 1:
+              val = (XSUBR (fun)->function.a1) (argvals[0]);
+              break;
+            case 2:
+              val = (XSUBR (fun)->function.a2) (argvals[0], argvals[1]);
+              break;
+            case 3:
+              val = (XSUBR (fun)->function.a3) (argvals[0], argvals[1],
+                                                argvals[2]);
+              break;
+            case 4:
+              val = (XSUBR (fun)->function.a4) (argvals[0], argvals[1],
+                                                argvals[2], argvals[3]);
+              break;
+            case 5:
+              val = (XSUBR (fun)->function.a5) (argvals[0], argvals[1], argvals[2],
+                                                argvals[3], argvals[4]);
+              break;
+            case 6:
+              val = (XSUBR (fun)->function.a6) (argvals[0], argvals[1], argvals[2],
+                                                argvals[3], argvals[4], argvals[5]);
+              break;
+            case 7:
+              val = (XSUBR (fun)->function.a7) (argvals[0], argvals[1], argvals[2],
+                                                argvals[3], argvals[4], argvals[5],
+                                                argvals[6]);
+
+              break;
+            case 8:
+              val = (XSUBR (fun)->function.a8) (argvals[0], argvals[1], argvals[2],
+                                                argvals[3], argvals[4], argvals[5],
+                                                argvals[6], argvals[7]);
+
+              break;
+            default:
+              /* Someone has created a subr that takes more arguments than
+                 is supported by this code.  We need to either rewrite the
+                 subr to use a different argument protocol, or add more
+                 cases to this switch.  */
+              abort ();
+            }
         }
     }
-  if (FUNVECP (fun))
+  else if (FUNVECP (fun))
     val = apply_lambda (fun, original_args);
   else
     {
@@ -2533,7 +2534,6 @@ eval_sub (Lisp_Object form)
       else
         xsignal1 (Qinvalid_function, original_fun);
     }
- done:
   CHECK_CONS_LIST ();
 
   lisp_eval_depth--;
@@ -3109,7 +3109,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
 
   if (SUBRP (fun))
     {
-       if (numargs < XSUBR (fun)->min_args
+      if (numargs < XSUBR (fun)->min_args
           || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs))
         {
           XSETFASTINT (lisp_numargs, numargs);
@@ -3119,74 +3119,72 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       if (XSUBR (fun)->max_args == UNEVALLED)
         xsignal1 (Qinvalid_function, original_fun);
 
-      if (XSUBR (fun)->max_args == MANY)
-        {
-          val = (XSUBR (fun)->function.aMANY) (numargs, args + 1);
-          goto done;
-        }
-
-      if (XSUBR (fun)->max_args > numargs)
-        {
-          internal_args = (Lisp_Object *) alloca (XSUBR (fun)->max_args * sizeof (Lisp_Object));
-          memcpy (internal_args, args + 1, numargs * sizeof (Lisp_Object));
-          for (i = numargs; i < XSUBR (fun)->max_args; i++)
-            internal_args[i] = Qnil;
-        }
+      else if (XSUBR (fun)->max_args == MANY)
+        val = (XSUBR (fun)->function.aMANY) (numargs, args + 1);
       else
-        internal_args = args + 1;
-      switch (XSUBR (fun)->max_args)
         {
-        case 0:
-          val = (XSUBR (fun)->function.a0) ();
-          goto done;
-        case 1:
-          val = (XSUBR (fun)->function.a1) (internal_args[0]);
-          goto done;
-        case 2:
-          val = (XSUBR (fun)->function.a2) (internal_args[0], internal_args[1]);
-          goto done;
-        case 3:
-          val = (XSUBR (fun)->function.a3) (internal_args[0], internal_args[1],
-                                            internal_args[2]);
-          goto done;
-        case 4:
-          val = (XSUBR (fun)->function.a4) (internal_args[0], internal_args[1],
-                                            internal_args[2], internal_args[3]);
-          goto done;
-        case 5:
-          val = (XSUBR (fun)->function.a5) (internal_args[0], internal_args[1],
-                                            internal_args[2], internal_args[3],
-                                            internal_args[4]);
-          goto done;
-        case 6:
-          val = (XSUBR (fun)->function.a6) (internal_args[0], internal_args[1],
-                                            internal_args[2], internal_args[3],
-                                            internal_args[4], internal_args[5]);
-          goto done;
-        case 7:
-          val = (XSUBR (fun)->function.a7) (internal_args[0], internal_args[1],
-                                            internal_args[2], internal_args[3],
-                                            internal_args[4], internal_args[5],
-                                            internal_args[6]);
-          goto done;
-
-        case 8:
-          val = (XSUBR (fun)->function.a8) (internal_args[0], internal_args[1],
-                                            internal_args[2], internal_args[3],
-                                            internal_args[4], internal_args[5],
-                                            internal_args[6], internal_args[7]);
-          goto done;
-
-        default:
-
-          /* If a subr takes more than 8 arguments without using MANY
-             or UNEVALLED, we need to extend this function to support it.
-             Until this is done, there is no way to call the function.  */
-          abort ();
+          if (XSUBR (fun)->max_args > numargs)
+            {
+              internal_args = (Lisp_Object *) alloca (XSUBR (fun)->max_args * sizeof (Lisp_Object));
+              memcpy (internal_args, args + 1, numargs * sizeof (Lisp_Object));
+              for (i = numargs; i < XSUBR (fun)->max_args; i++)
+                internal_args[i] = Qnil;
+            }
+          else
+            internal_args = args + 1;
+          switch (XSUBR (fun)->max_args)
+            {
+            case 0:
+              val = (XSUBR (fun)->function.a0) ();
+              break;
+            case 1:
+              val = (XSUBR (fun)->function.a1) (internal_args[0]);
+              break;
+            case 2:
+              val = (XSUBR (fun)->function.a2) (internal_args[0], internal_args[1]);
+              break;
+            case 3:
+              val = (XSUBR (fun)->function.a3) (internal_args[0], internal_args[1],
+                                                internal_args[2]);
+              break;
+            case 4:
+              val = (XSUBR (fun)->function.a4) (internal_args[0], internal_args[1],
+                                                internal_args[2], internal_args[3]);
+              break;
+            case 5:
+              val = (XSUBR (fun)->function.a5) (internal_args[0], internal_args[1],
+                                                internal_args[2], internal_args[3],
+                                                internal_args[4]);
+              break;
+            case 6:
+              val = (XSUBR (fun)->function.a6) (internal_args[0], internal_args[1],
+                                                internal_args[2], internal_args[3],
+                                                internal_args[4], internal_args[5]);
+              break;
+            case 7:
+              val = (XSUBR (fun)->function.a7) (internal_args[0], internal_args[1],
+                                                internal_args[2], internal_args[3],
+                                                internal_args[4], internal_args[5],
+                                                internal_args[6]);
+              break;
+
+            case 8:
+              val = (XSUBR (fun)->function.a8) (internal_args[0], internal_args[1],
+                                                internal_args[2], internal_args[3],
+                                                internal_args[4], internal_args[5],
+                                                internal_args[6], internal_args[7]);
+              break;
+
+            default:
+
+              /* If a subr takes more than 8 arguments without using MANY
+                 or UNEVALLED, we need to extend this function to support it.
+                 Until this is done, there is no way to call the function.  */
+              abort ();
+            }
         }
     }
-
-  if (FUNVECP (fun))
+  else if (FUNVECP (fun))
     val = funcall_lambda (fun, numargs, args + 1);
   else
     {
@@ -3209,7 +3207,6 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       else
         xsignal1 (Qinvalid_function, original_fun);
     }
- done:
   CHECK_CONS_LIST ();
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)