1 files changed, 18 insertions, 9 deletions

diff --git a/src/eval.c b/src/eval.c
index 8810136c041..d2cab006d11 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -484,8 +484,7 @@ usage: (setq [SYM VAL]...)  */)
       /* Like for eval_sub, we do not check declared_special here since
          it's been done when let-binding.  */
       Lisp_Object lex_binding
-        = ((!NILP (Vinternal_interpreter_environment) /* Mere optimization!  */
-            && SYMBOLP (sym))
+        = (SYMBOLP (sym)
            ? Fassq (sym, Vinternal_interpreter_environment)
            : Qnil);
       if (!NILP (lex_binding))
@@ -551,8 +550,15 @@ usage: (function ARG)  */)
           CHECK_STRING (docstring);
           cdr = Fcons (XCAR (cdr), Fcons (docstring, XCDR (XCDR (cdr))));
         }
-      return Fcons (Qclosure, Fcons (Vinternal_interpreter_environment,
-                                     cdr));
+      Lisp_Object env
+        = NILP (Vinternal_filter_closure_env_function)
+          ? Vinternal_interpreter_environment
+          /* FIXME: This macroexpands the body, so we should use the resulting
+             macroexpanded code!  */
+          : call2 (Vinternal_filter_closure_env_function,
+                   Fcons (Qprogn, CONSP (cdr) ? XCDR (cdr) : cdr),
+                   Vinternal_interpreter_environment);
+      return Fcons (Qclosure, Fcons (env, cdr));
     }
   else
     /* Simply quote the argument.  */
@@ -2374,9 +2380,7 @@ eval_sub (Lisp_Object form)
          We do not pay attention to the declared_special flag here, since we
          already did that when let-binding the variable.  */
       Lisp_Object lex_binding
-        = (!NILP (Vinternal_interpreter_environment) /* Mere optimization!  */
-           ? Fassq (form, Vinternal_interpreter_environment)
-           : Qnil);
+        = Fassq (form, Vinternal_interpreter_environment);
       return !NILP (lex_binding) ? XCDR (lex_binding) : Fsymbol_value (form);
     }
 
@@ -2392,7 +2396,7 @@ eval_sub (Lisp_Object form)
       if (max_lisp_eval_depth < 100)
         max_lisp_eval_depth = 100;
       if (lisp_eval_depth > max_lisp_eval_depth)
-        xsignal0 (Qexcessive_lisp_nesting);
+        xsignal1 (Qexcessive_lisp_nesting, make_fixnum (lisp_eval_depth));
     }
 
   Lisp_Object original_fun = XCAR (form);
@@ -2966,7 +2970,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       if (max_lisp_eval_depth < 100)
         max_lisp_eval_depth = 100;
       if (lisp_eval_depth > max_lisp_eval_depth)
-        xsignal0 (Qexcessive_lisp_nesting);
+        xsignal1 (Qexcessive_lisp_nesting, make_fixnum (lisp_eval_depth));
     }
 
   count = record_in_backtrace (args[0], &args[1], nargs - 1);
@@ -4357,6 +4361,11 @@ alist of active lexical bindings.  */);
      (Just imagine if someone makes it buffer-local).  */
   Funintern (Qinternal_interpreter_environment, Qnil);
 
+  DEFVAR_LISP ("internal-filter-closure-env-function",
+               Vinternal_filter_closure_env_function,
+               doc: /* Function to filter the env when constructing a closure.  */);
+  Vinternal_filter_closure_env_function = Qnil;
+
   Vrun_hooks = intern_c_string ("run-hooks");
   staticpro (&Vrun_hooks);