X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=d930cdaa372868622e4624883c4ace2f5539e2a9;hb=1db7333bd35dc000e1cdde0286d7bf8384cb3b28;hp=7c5ce5019c0fe76b1c1d8ecf7117d6037953d862;hpb=207f71b8b2ab9ca550e841615bedce393e652ca6;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 7c5ce5019c..d930cdaa37 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -35,8 +35,6 @@
 #include "warn.hh"
 #include "lily-imports.hh"
 
-using std::string;
-
 static void
 replace_special_characters (string &str, SCM props)
 {
@@ -136,6 +134,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
       scm_dynwind_unwind_handler (markup_down_depth, 0, SCM_F_WIND_EXPLICITLY);
       if (markup_depth > max_depth)
         {
+          scm_dynwind_end ();
           string name = ly_symbol2string (scm_procedure_name (func));
           // TODO: Also print the arguments of the markup!
           non_fatal_error (_f ("Markup depth exceeds maximal value of %d; "