~ chicken-core (chicken-5) ceebffcad686378635edeeea6906c75faf9d4e01

commit ceebffcad686378635edeeea6906c75faf9d4e01
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Dec 5 18:22:56 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Dec 5 18:22:56 2010 +0100

    non-inlined cons in expander broken when redefined (reported by David Steiner)

diff --git a/expand.scm b/expand.scm
index 22b6a618..c7beae66 100644
--- a/expand.scm
+++ b/expand.scm
@@ -120,7 +120,7 @@
   (for-each 
    (cut ##sys#put! <> '##core#real-name <>) 
    aliases vars)
-  (append (map cons vars aliases) se))
+  (append (map (lambda (x y) (cons x y)) vars aliases) se)) ; inline cons
 
 
 ;;; Macro handling
diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index 32c1e28d..77d7d102 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -40,7 +40,7 @@ Burton Samograd, Reed Sheridan, Ronald Schroeder, Spencer Schumann,
 Ivan Shcheklein, Alex Shinn, Ivan Shmakov, "Shmul", Tony Sidaway,
 Jeffrey B. Siegal, Andrey Sidorenko, Michele Simionato, Iruata Souza,
 Volker Stolz, Jon Strait, Dorai Sitaram, Robert Skeels, Jason
-Songhurst, Clifford Stein, Sunnan, Zbigniew Szadkowski, Rick Taube,
+Songhurst, Clifford Stein, David Steiner, Sunnan, Zbigniew Szadkowski, Rick Taube,
 Nathan Thern, Mike Thomas, Minh Thu, Christian Tismer, Andre van
 Tonder, John Tobey, Henrik Tramberend, Vladimir Tsichevsky, Neil van
 Dyke, Sam Varner, Taylor Venable, Sander Vesik, Jaques Vidrine,