Issue 4906/5: Don't let ADD_END_ACKNOWLEDGER_FOR add end_ to callback

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 02f9fbe8c7b629dcb6852265148b3a3d837ad32d..80a7466cd18c0a6e4a41d3bfebd57143890a1f96 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -102,11 +102,15 @@ void add_acknowledger (SCM ptr,
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME) ADD_ACKNOWLEDGER_FOR (CLASS, NAME, NAME)
 
+// ADD_END_ACKNOWLEDGER_FOR requires your NAME to actually be
+// end_whatever if you are utilizing acknowledge_end_whatever as a
+// different end acknowledger.
 #define ADD_END_ACKNOWLEDGER_FOR(CLASS, NAME, GROB)                     \
-  add_acknowledger (method_finder<&CLASS::acknowledge_end_ ## NAME> (), \
+  add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (),     \
                     #GROB, acknowledge_static_array_drul_[STOP])
 
-#define ADD_END_ACKNOWLEDGER(CLASS, NAME) ADD_END_ACKNOWLEDGER_FOR (CLASS, NAME, NAME)
+#define ADD_END_ACKNOWLEDGER(CLASS, NAME)               \
+  ADD_END_ACKNOWLEDGER_FOR (CLASS, end_ ## NAME, NAME)
 
 /*
   Implement the method cl::listen_##m, and make it listen to stream