* lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):

Don't macroexpand before evaluating in eval-and-compile, in case
`body's macro expansion uses macros and functions defined in itself.

* src/bytecode.c (exec_byte_code):
* src/eval.c (Ffunctionp): Fix up int/Lisp_Object confusions.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index fec855c0b83..192d397c45f 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1742,7 +1742,7 @@ exec_byte_code (bytestr, vector, maxdepth, args_template, nargs, args)
             if (! VECTORP (vec))
               wrong_type_argument (Qvectorp, vec);
             else if (index < 0 || index >= XVECTOR (vec)->size)
-              args_out_of_range (vec, index);
+              args_out_of_range (vec, make_number (index));
 
             if (op == Bvec_ref)
               PUSH (XVECTOR (vec)->contents[index]);