(interpret_stencil_expression): bugfix

diff --git a/ChangeLog b/ChangeLog
index 2bac45df3887562da11fd194f9ee7ee83bf4081c..3ac62adf4ccb2ad4a530bb8e2bdc77d54962f6a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/stencil.cc (interpret_stencil_expression): bugfix 
+
 2004-06-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * debian/: Remove cruft (requested Anthony Fok.)

diff --git a/lily/stencil.cc b/lily/stencil.cc
index e0604dbb129284619a14589d205f58709bf92eba..14d7961b8a0783c944a60eaf30ca526953084018 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -220,12 +220,9 @@ interpret_stencil_expression (SCM expr,
          
          (*func) (func_arg, scm_list_2 (head, grob));
          interpret_stencil_expression (ly_caddr (expr), func, func_arg, o);
-#if 0 //FIXME: why do we need, this + endless loop?  -- jcn
          (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin")));
-#else
-#endif   
-         //expr = ly_cadddr (expr);
-         return;
+         
+         return ; 
        }
       else
         {