Merge commit 'cb9d473112ac172a3d328bb029b5b550918d4262' into vm-check

diff --cc configure.in
index b9d46e6,d2ac7b0..589053a
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1540,11 -1538,13 +1540,8 @@@ AC_CONFIG_FILES(
    examples/safe/Makefile
    examples/scripts/Makefile
    guile-config/Makefile
 -  ice-9/Makefile
 -  ice-9/debugger/Makefile
 -  ice-9/debugging/Makefile
    lang/Makefile
-   lang/elisp/Makefile
-   lang/elisp/internals/Makefile
-   lang/elisp/primitives/Makefile
    libguile/Makefile
 -  oop/Makefile
 -  oop/goops/Makefile
    scripts/Makefile
    srfi/Makefile
    test-suite/Makefile

diff --cc libguile/eval.i.c
Simple merge