X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil-expression.cc;h=8d804196202368c1eaf1043cac78de4e91253fb2;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=750d088e1637057a914d2cefbb651a548f2f827a;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc
index 750d088e16..8d80419620 100644
--- a/lily/stencil-expression.cc
+++ b/lily/stencil-expression.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,28 +18,24 @@
 */
 
 #include "stencil.hh"
+#include "protected-scm.hh"
 
-static SCM heads;
+static Protected_scm heads (SCM_EOL);
 
 void register_stencil_head (SCM symbol)
 {
-  if (!heads)
-    heads = scm_permanent_object (scm_cons (SCM_EOL, SCM_EOL));
-
   scm_set_object_property_x (symbol, ly_symbol2scm ("stencil-head?"), SCM_BOOL_T);
-  scm_set_cdr_x (heads, scm_cons (symbol, scm_cdr (heads)));
+  heads = scm_cons (symbol, heads);
 }
 
 bool
 is_stencil_head (SCM symbol)
 {
-  return scm_object_property (symbol, ly_symbol2scm ("stencil-head?"))
-         == SCM_BOOL_T;
+  return to_boolean (scm_object_property (symbol, ly_symbol2scm ("stencil-head?")));
 }
 
 SCM
 all_stencil_heads ()
 {
-  return scm_cdr (heads);
+  return heads;
 }
-