Various compiler bug-fixes. MPC seems to run correctly now.

* lisp/files.el (lexical-binding): Add a safe-local-variable property.

* lisp/emacs-lisp/byte-opt.el (byte-inline-lapcode): Check how many elements
are added to the stack.
(byte-compile-splice-in-already-compiled-code): Don't touch lexical nor
byte-compile-depth now that byte-inline-lapcode does it for us.
(byte-compile-inline-expand): Don't inline dynbind byte code into
lexbind code, since it has to be done differently.

* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
Correctly extract arglist from `closure's.
(byte-compile-cl-warn): Compiler-macros are run earlier now.
(byte-compile-top-level): Bind byte-compile-lexical-environment to nil,
except for lambdas.
(byte-compile-form): Don't run the compiler-macro expander here.
(byte-compile-let): Merge with byte-compile-let*.
Don't preserve-body-value if the body's value was discarded.

* lisp/emacs-lisp/cconv.el (cconv--set-diff, cconv--set-diff-map)
(cconv--map-diff, cconv--map-diff-elem, cconv--map-diff-set): New funs.
(cconv--env-var): New constant.
(cconv-closure-convert-rec): Use it and use them.  Fix a typo that
ended up forgetting to remove entries from lmenvs in `let'.
For `lambda' use the outer `fvrs' when building the closure and don't
forget to remove `vars' from the `emvrs' and `lmenvs' of the body.

* lisp/emacs-lisp/cl-macs.el (cl-byte-compile-block): Disable optimization
in lexbind, because it needs a different implementation.

* src/bytecode.c (exec_byte_code): Fix handling of &rest.

* src/eval.c (Vinternal_interpreter_environment): Remove.
(syms_of_eval): Do declare Vinternal_interpreter_environment as
a global lisp var, but unintern it to hide it.
(Fcommandp):
* src/data.c (Finteractive_form): Understand `closure's.

5 files changed, 34 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6674fb31ca5..0b2ee8550ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Vinternal_interpreter_environment): Remove.
+        (syms_of_eval): Do declare Vinternal_interpreter_environment as
+        a global lisp var, but unintern it to hide it.
+        (Fcommandp):
+        * data.c (Finteractive_form): Understand `closure's.
+
+        * bytecode.c (exec_byte_code): Fix handling of &rest.
+
 2011-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * bytecode.c (Bvec_ref, Bvec_set): Remove.
diff --git a/src/bytecode.c b/src/bytecode.c
index 9bf6ae45ce9..1ad01aaf8f7 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -500,7 +500,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           optional = 1;
         else if (EQ (XCAR (at), Qand_rest))
           {
-            PUSH (Flist (nargs, args));
+            PUSH (pushed < nargs
+                  ? Flist (nargs - pushed, args)
+                  : Qnil);
             pushed = nargs;
             at = Qnil;
             break;
diff --git a/src/data.c b/src/data.c
index 83da3e103cb..2f17edd3fdc 100644
--- a/src/data.c
+++ b/src/data.c
@@ -755,6 +755,8 @@ Value, if non-nil, is a list \(interactive SPEC).  */)
   else if (CONSP (fun))
     {
       Lisp_Object funcar = XCAR (fun);
+      if (EQ (funcar, Qclosure))
+        fun = Fcdr (XCDR (fun)), funcar = Fcar (fun);
       if (EQ (funcar, Qlambda))
         return Fassq (Qinteractive, Fcdr (XCDR (fun)));
       else if (EQ (funcar, Qautoload))
diff --git a/src/eval.c b/src/eval.c
index 9adfc983ced..63484d40e1b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -78,16 +78,6 @@ Lisp_Object Vrun_hooks;
 
 Lisp_Object Vautoload_queue;
 
-/* When lexical binding is being used, this is non-nil, and contains an
-   alist of lexically-bound variable, or (t), indicating an empty
-   environment.  The lisp name of this variable is
-   `internal-interpreter-environment'.  Every element of this list
-   can be either a cons (VAR . VAL) specifying a lexical binding,
-   or a single symbol VAR indicating that this variable should use
-   dynamic scoping.  */
-
-Lisp_Object Vinternal_interpreter_environment;
-
 /* Current number of specbindings allocated in specpdl.  */
 
 EMACS_INT specpdl_size;
@@ -2092,9 +2082,11 @@ then strings and vectors are not accepted.  */)
   if (!CONSP (fun))
     return Qnil;
   funcar = XCAR (fun);
+  if (EQ (funcar, Qclosure))
+    fun = Fcdr (XCDR (fun)), funcar = Fcar (fun);
   if (EQ (funcar, Qlambda))
     return !NILP (Fassq (Qinteractive, Fcdr (XCDR (fun)))) ? Qt : if_prop;
-  if (EQ (funcar, Qautoload))
+  else if (EQ (funcar, Qautoload))
     return !NILP (Fcar (Fcdr (Fcdr (XCDR (fun))))) ? Qt : if_prop;
   else
     return Qnil;
@@ -3695,6 +3687,8 @@ mark_backtrace (void)
     }
 }
 
+EXFUN (Funintern, 2);
+
 void
 syms_of_eval (void)
 {
@@ -3840,19 +3834,27 @@ DECL is a list `(declare ...)' containing the declarations.
 The value the function returns is not used.  */);
   Vmacro_declaration_function = Qnil;
 
+  /* When lexical binding is being used,
+   vinternal_interpreter_environment is non-nil, and contains an alist
+   of lexically-bound variable, or (t), indicating an empty
+   environment.  The lisp name of this variable would be
+   `internal-interpreter-environment' if it weren't hidden.
+   Every element of this list can be either a cons (VAR . VAL)
+   specifying a lexical binding, or a single symbol VAR indicating
+   that this variable should use dynamic scoping.  */
   Qinternal_interpreter_environment
     = intern_c_string ("internal-interpreter-environment");
   staticpro (&Qinternal_interpreter_environment);
-#if 0 /* Don't export this variable to Elisp, so noone can mess with it
-         (Just imagine if someone makes it buffer-local).  */
-  DEFVAR__LISP ("internal-interpreter-environment",
-               Vinternal_interpreter_environment,
+  DEFVAR_LISP ("internal-interpreter-environment",
+                Vinternal_interpreter_environment,
                doc: /* If non-nil, the current lexical environment of the lisp interpreter.
 When lexical binding is not being used, this variable is nil.
 A value of `(t)' indicates an empty environment, otherwise it is an
 alist of active lexical bindings.  */);
-#endif
   Vinternal_interpreter_environment = Qnil;
+  /* Don't export this variable to Elisp, so noone can mess with it
+     (Just imagine if someone makes it buffer-local).  */
+  Funintern (Qinternal_interpreter_environment, Qnil);
 
   Vrun_hooks = intern_c_string ("run-hooks");
   staticpro (&Vrun_hooks);
diff --git a/src/lisp.h b/src/lisp.h
index 906736bacad..0e7eeebc9da 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2855,7 +2855,7 @@ extern void syms_of_lread (void);
 
 /* Defined in eval.c */
 extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
-extern Lisp_Object Qinhibit_quit;
+extern Lisp_Object Qinhibit_quit, Qclosure;
 extern Lisp_Object Vautoload_queue;
 extern Lisp_Object Vsignaling_function;
 extern int handling_signal;