Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / guile-init.cc

diff --git a/lily/guile-init.cc b/lily/guile-init.cc
index 5f1bb6e27fb6487f8e2d71606d4a1561dce9ba41..e737dcf706f8877a8854f3cdb312d25a236dd99d 100644 (file)
--- a/lily/guile-init.cc
+++ b/lily/guile-init.cc
@@ -2,7 +2,7 @@
   This file is part of LilyPond, the GNU music typesetter.
 
   Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,15 +18,14 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include  "lily-guile.hh"
-#include  "main.hh"
-#include  "warn.hh"
+#include "lily-guile.hh"
+#include "main.hh"
+#include "warn.hh"
 
 /*
   INIT
 */
 
-
 typedef void (*Void_fptr) ();
 vector<Void_fptr> *scm_init_funcs_;
 
@@ -44,12 +43,12 @@ ly_init_ly_module (void *)
   for (vsize i = scm_init_funcs_->size (); i--;)
     (scm_init_funcs_->at (i)) ();
 
-  if (be_verbose_global)
+  if (is_loglevel (LOG_DEBUG))
     {
-      progress_indication ("[");
+      debug_output ("[", true);
       scm_display (scm_c_eval_string ("(%search-load-path \"lily.scm\")"),
-                  scm_current_error_port ());
-      progress_indication ("]\n");
+                   scm_current_error_port ());
+      debug_output ("]\n", false);
     }
 
   scm_primitive_load_path (scm_from_locale_string ("lily.scm"));