Merge branch 'master' of ssh://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index 7661deadaaacf7f463a7619523fd927b4f8fe7cc..f2a452356ae71f7ccde38d1a6559a6c11c2a64f2 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -108,7 +108,7 @@ in <a class="title" href="user/lilypond.pdf">PDF</a>)
      <br>(on background information)
 
     <li>
-     <a class="title" href="../input/regression/collated-files.html">Regression tests</a> (~ 5 Mb, in <a  class="title" href="../input/regression/collated-files.pdf">PDF</a>, <a href="../test-results.html">comparison</a>)
+     <a class="title" href="../input/regression/collated-files.html">Regression tests</a> (~ 5 Mb, in <a  class="title" href="../input/regression/collated-files.pdf">PDF</a>)
      <br>(for developers)
 
        </ul>

diff --git a/scm/lily.scm b/scm/lily.scm
index 6f2f09d2e6f5ed67475f926c4a8b71c0b9fe0ddf..bddf997764e03ca8d930f66875748749d445aa13 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -416,7 +416,7 @@ The syntax is the same as `define*-public'."
     (ly:progress "\nWriting timing to ~a..." outname)
     (format (open-file outname "w")
            "time: ~a\ncells: ~a\n"
-           (if (ly:option 'dump-cpu-profile)
+           (if (ly:get-option 'dump-cpu-profile)
                (car diff)
                0)
            (cadr diff)