Merge branch 'bt/elisp'
authorBT Templeton <bpt@hcoop.net>
Mon, 5 Mar 2012 21:52:05 +0000 (16:52 -0500)
committerBT Templeton <bpt@hcoop.net>
Mon, 5 Mar 2012 21:52:05 +0000 (16:52 -0500)
commit5ddd9645c94f339f8795bf9b3ece8d518a8de004
treeb7759e320ef4f146e01d4f1b8a0bdddf07cb7799
parentd019ef92886bebc2d0e79db7c16abacc50b6f77d
parenteaeda0d550c513f4d134304d9adda28e1d65a23b
Merge branch 'bt/elisp'

Conflicts:
am/guilec
libguile/_scm.h
libguile/vm-i-scheme.c
module/language/elisp/compile-tree-il.scm
module/language/elisp/runtime.scm
module/language/elisp/runtime/macros.scm
module/language/tree-il/compile-glil.scm
module/language/tree-il/primitives.scm
am/guilec
libguile/_scm.h
libguile/vm-i-scheme.c
libguile/vm-i-system.c
module/Makefile.am
module/language/assembly/disassemble.scm
module/language/elisp/compile-tree-il.scm
module/language/elisp/runtime.scm
module/language/tree-il/compile-glil.scm
module/language/tree-il/primitives.scm