X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodule-scheme.cc;h=8938229e5952263eade2b9b9558cb37b337531d4;hb=de94141c98300335d2675fff9e5a4cb9b42fccac;hp=0d64fa52905df0dba49710285737942302aa8078;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index 0d64fa5290..8938229e59 100644
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -3,25 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "lily-guile.hh"
+#include "ly-module.hh"
+
 #include "warn.hh"
 #include "main.hh"
 #include "std-string.hh"
 
-#include "ly-module.hh"
 
 /*
-  If a variable in changed in SRC, we DEST doesn't see the
+  If a variable is changed in SRC, then DEST doesn't see the
   definitions.
 */
 
 static SCM
-module_define_closure_func (void *closure, SCM key, SCM val, SCM result)
+module_define_closure_func (void *closure,
+			    SCM key,
+			    SCM val,
+			    SCM /* result */)
 {
-  (void) result;
   SCM module = (SCM) closure;
   if (scm_variable_bound_p (val) == SCM_BOOL_T)
     scm_module_define (module, key, scm_variable_ref (val));
@@ -30,7 +32,7 @@ module_define_closure_func (void *closure, SCM key, SCM val, SCM result)
 
 LY_DEFINE (ly_module_copy, "ly:module-copy",
 	   2, 0, 0, (SCM dest, SCM src),
-	   "Copy all bindings from module SRC into DEST.")
+	   "Copy all bindings from module @var{src} into @var{dest}.")
 {
 #define FUNC_NAME __FUNCTION__
   SCM_VALIDATE_MODULE (1, src);
@@ -42,8 +44,8 @@ LY_DEFINE (ly_module_copy, "ly:module-copy",
 
 LY_DEFINE (ly_clear_anonymous_modules, "ly:clear-anonymous-modules",
 	   0, 0, 0, (),
-	   "Plug a GUILE 1.6 and 1.7 memory leak by breaking a weak reference "
-	   "pointer cycle explicitly.")
+	   "Plug a GUILE 1.6 and 1.7 memory leak by breaking a weak"
+	   " reference pointer cycle explicitly.")
 {
 #ifdef MODULE_GC_KLUDGE
   clear_anonymous_modules ();
@@ -68,9 +70,9 @@ ly_module_lookup (SCM module, SCM sym)
 LY_DEFINE (ly_modules_lookup, "ly:modules-lookup",
 	   2, 1, 0,
 	   (SCM modules, SCM sym, SCM def),
-	   "Lookup @var{sym} in the list @var{modules}, "
-	   "returning the first occurence.  "
-	   "If not found, return @var{default}, or @code{#f}.")
+	   "Look up @var{sym} in the list @var{modules},"
+	   " returning the first occurence.  If not found, return"
+	   " @var{def} or @code{#f} if @var{def} isn't specified.")
 {
   for (SCM s = modules; scm_is_pair (s); s = scm_cdr (s))
     {