>From 6d974c4990f2bb4c34605908ba3b7ca1c21487cf Mon Sep 17 00:00:00 2001
From: David Kastrup <address@hidden>
Date: Thu, 11 Oct 2018 20:52:19 +0200
Subject: [PATCH] Use different `values' implementation of Guilev2

---
 lily/lexer.ll | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 421fea2734..f893715e8e 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -1107,6 +1107,13 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 
 	if (extra_token && SCM_VALUESP (sval))
 	{
+#if GUILEV2
+		size_t nvals = scm_c_nvalues (sval);
+
+		if (nvals > 0) {
+			while (--nvals) {
+				SCM v = scm_c_value_ref (sval, nvals);
+#else
 		sval = scm_struct_ref (sval, SCM_INUM0);
 
 		if (scm_is_pair (sval)) {
@@ -1115,6 +1122,7 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 			     p = scm_cdr (p))
 			{
 				SCM v = scm_car (p);
+#endif
 				if (Music *m = unsmob<Music> (v))
 				{
 					if (!unsmob<Input> (m->get_property ("origin")))
@@ -1135,7 +1143,11 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 					break;
 				}
 			}
+#if GUILEV2
+			sval = scm_c_value_ref (sval, 0);
+#else
 			sval = scm_car (sval);
+#endif
 		} else
 			sval = SCM_UNSPECIFIED;
 	}
-- 
2.17.1