From: Thomas Morley <thomasmorley65@gmail.com>
Date: Tue, 21 Mar 2017 20:13:30 +0000 (+0100)
Subject: Issue 5104 Let scheme-sandbox use system-repl with guile-2.x
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=c7e5396bb1d191783265512284f8131a7b5ada74;p=lilypond.git

Issue 5104 Let scheme-sandbox use system-repl with guile-2.x

This fixes the warning returned by guile-2.x

	`scm-style-repl' in the default environment is deprecated.
	Find it in the `(ice-9 scm-style-repl)' module instead, or
	better yet, use the repl from `(system repl repl)'.
---

diff --git a/ly/scheme-sandbox.ly b/ly/scheme-sandbox.ly
index 7dec0dcd1c..1f233c0cfa 100644
--- a/ly/scheme-sandbox.ly
+++ b/ly/scheme-sandbox.ly
@@ -13,4 +13,8 @@
 % requirements may be different.
 
 #(newline)
-#(scm-style-repl)
+#(if (guile-v2)
+     (begin
+       (use-modules (system repl repl))
+       (start-repl))
+     (scm-style-repl))