From: Phil Holmes <mail@philholmes.net>
Date: Tue, 9 May 2017 10:07:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/release/unstable' into HEAD
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=024c0e02b523df0f1de0203cae949c3ad864d26c;hp=2e46ee8ff6e49e9863db34b95cce23927c4e5ee7

Merge remote-tracking branch 'origin/release/unstable' into HEAD
---

diff --git a/scm/stencil.scm b/scm/stencil.scm
index 00f8503487..391e80882f 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -727,10 +727,12 @@ box, remains the same."
     replaced-stil))
 
 (define-public (stencil-with-color stencil color)
-  (ly:make-stencil
-   (list 'color color (ly:stencil-expr stencil))
-   (ly:stencil-extent stencil X)
-   (ly:stencil-extent stencil Y)))
+  (if (color? color)
+      (ly:make-stencil
+       (list 'color color (ly:stencil-expr stencil))
+       (ly:stencil-extent stencil X)
+       (ly:stencil-extent stencil Y))
+      stencil))
 
 (define*-public (stencil-whiteout-outline
                  stil #:optional (thickness 0.3) (color white)