Revert pnmgray hack.

[lilypond.git] / lily / dispatcher.cc

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index b86d045bc1cb5a01b2657b102e48f1606ca19be0..6107594900b678e8a63d2c140ebfe1b3c3176300 100644 (file)
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -10,7 +10,6 @@
 #include "input.hh"
 #include "international.hh"
 #include "ly-smobs.icc"
-#include "stream-event.hh"
 #include "warn.hh"
 
 IMPLEMENT_SMOBS (Dispatcher);
@@ -223,7 +222,7 @@ Dispatcher::remove_listener (Listener l, SCM ev_class)
   else if (!scm_is_pair (list))
     {
       /* Unregister with all dispatchers. */
-      for (SCM disp = dispatchers_; disp != SCM_EOL; disp = scm_cdr (disp))
+      for (SCM disp = dispatchers_; scm_is_pair (disp); disp = scm_cdr (disp))
        {
          Dispatcher *d = unsmob_dispatcher (scm_caar (disp));
          d->remove_listener (GET_LISTENER (dispatch), ev_class);
@@ -248,7 +247,7 @@ Dispatcher::register_as_listener (Dispatcher *disp)
   dispatchers_ = scm_acons (disp->self_scm (), scm_int2num (priority), dispatchers_);
 
   Listener list = GET_LISTENER (dispatch);
-  for (SCM cl = listen_classes_; cl != SCM_EOL; cl = scm_cdr (cl))
+  for (SCM cl = listen_classes_; scm_is_pair (cl); cl = scm_cdr (cl))
     {
       disp->internal_add_listener (list, scm_car (cl), priority);
     }