X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprogram-option-scheme.cc;h=88d16e167f94e904b99e0a6f111776e9c05d70f4;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=80cd0e4e2fc25193c5ecc327c726a626700db83f;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git

diff --git a/lily/program-option-scheme.cc b/lily/program-option-scheme.cc
index 80cd0e4e2f..88d16e167f 100644
--- a/lily/program-option-scheme.cc
+++ b/lily/program-option-scheme.cc
@@ -29,6 +29,8 @@ using namespace std;
 #include "parse-scm.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
+#include "protected-scm.hh"
 
 bool debug_skylines;
 bool debug_property_callbacks;
@@ -44,7 +46,7 @@ bool profile_property_accesses = false;
 bool do_internal_type_checking_global;
 bool strict_infinity_checking = false;
 
-static SCM option_hash;
+static Protected_scm option_hash;
 
 void
 internal_set_option (SCM var,
@@ -136,7 +138,6 @@ static string
 get_help_string ()
 {
   SCM alist = ly_hash2alist (option_hash);
-  SCM converter = ly_lily_module_constant ("scm->string");
 
   vector<string> opts;
 
@@ -147,7 +148,7 @@ get_help_string ()
       string opt_spec = String_convert::char_string (' ', INDENT)
                         + ly_symbol2string (sym)
                         + " ("
-                        + ly_scm2string (scm_call_1 (converter, val))
+                        + ly_scm2string (Lily::scm_to_string (val))
                         + ")";
 
       if (opt_spec.length () + SEPARATION > HELP_INDENT)
@@ -190,8 +191,8 @@ LY_DEFINE (ly_add_option, "ly:add-option", 3, 0, 0,
            "Add a program option @var{sym}.  @var{val} is the default"
            " value and @var{description} is a string description.")
 {
-  if (!option_hash)
-    option_hash = scm_permanent_object (scm_c_make_hash_table (11));
+  if (!option_hash.is_bound ())
+    option_hash = scm_c_make_hash_table (11);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 1);
   LY_ASSERT_TYPE (scm_is_string, description, 3);