Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / stencil-scheme.cc

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index 9526e5cc2e79e2aca807decf4c5ecd68b1669d55..629c76c98b9be84457764b8eb260fc70a82afe96 100644 (file)
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -92,7 +92,7 @@ LY_DEFINE (ly_stencil_empty_p, "ly:stencil-empty?",
 }
 
 LY_DEFINE (ly_stencil_combine_at_edge, "ly:stencil-combine-at-edge",
-           4, 2, 0, (SCM first, SCM axis, SCM direction,
+           4, 1, 0, (SCM first, SCM axis, SCM direction,
                      SCM second,
                      SCM padding),
            "Construct a stencil by putting @var{second} next to @var{first}."