X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=95d4081f3938863d160fa5d07d61aca5d3488ee3;hb=6071d12f8cb830c5761445c45ac76d942638b57d;hp=47613b5ca3b8650f52a10c284d7430e8c72af4b4;hpb=f8eebf9751f142cedcedb370b34b5cc2d0fc737c;p=lilypond.git

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 47613b5ca3..95d4081f39 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -99,7 +99,6 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file",
   return scm_from_locale_stringn (contents.c_str (), contents.length ());
 }
 
-
 LY_DEFINE (ly_dir_p, "ly:dir?",
            1, 0, 0, (SCM s),
            "Is @var{s} a direction?  Valid directions are @w{@code{-1}},"
@@ -229,8 +228,8 @@ LY_DEFINE (ly_number_2_string, "ly:number->string",
       Real r (scm_to_double (s));
       if (isinf (r) || isnan (r))
         {
-          programming_error (_ ("infinity or NaN encountered while converting Real number"));
-          programming_error (_ ("setting to zero"));
+          programming_error ("infinity or NaN encountered while converting Real number, "
+                             "setting to zero");
 
           r = 0.0;
         }
@@ -272,7 +271,12 @@ LY_DEFINE (ly_protects, "ly:protects",
            0, 0, 0, (),
            "Return hash of protected objects.")
 {
+  //scm_protects is available only in Guile versions before 2.1.
+#if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
   return scm_protects;
+#else
+  return programming_error ("ly:protects is not supported in Guile 2.1");
+#endif
 }
 
 LY_DEFINE (ly_gettext, "ly:gettext",
@@ -467,7 +471,7 @@ format_single_argument (SCM arg, int precision, bool escape = false)
 
       if (isnan (val) || isinf (val))
         {
-          warning (_ ("Found infinity or nan in output. Substituting 0.0"));
+          warning (_ ("Found infinity or nan in output.  Substituting 0.0"));
           return ("0.0");
           if (strict_infinity_checking)
             abort ();