From 12721976deaf35e7cb3db676e9916b4181ddab7b Mon Sep 17 00:00:00 2001
From: Valentin Villenave <valentin@villenave.net>
Date: Sat, 21 Dec 2013 19:34:19 +0100
Subject: [PATCH] Use scm-load instead of load.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It’s completely identical, but it just feels cleaner to me.
I’m a neat freak like that.
---
 bin/macros.scm        |  2 +-
 bin/text.scm          |  4 ++--
 lib/40-loadmacros.scm |  2 +-
 lib/50-loadthemes.scm |  2 +-
 lib/80-buildskel.scm  |  3 ++-
 lib/init.scm          | 11 +++++++++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/bin/macros.scm b/bin/macros.scm
index 4562ede..d8feda6 100644
--- a/bin/macros.scm
+++ b/bin/macros.scm
@@ -19,7 +19,7 @@
 
 ; Input macros.
 
-(load "../lib/libmusic.scm")
+(scm-load "../lib/libmusic.scm")
 
 ;; TODO: use make-simple-function everywhere possible.
 
diff --git a/bin/text.scm b/bin/text.scm
index b46a4b0..aa9f7a8 100644
--- a/bin/text.scm
+++ b/bin/text.scm
@@ -19,8 +19,8 @@
 
 ;; Macros for entering text elements.
 
-(load "../lib/libtext.scm")
-(load "../lib/libgraphics.scm")
+(scm-load "../lib/libtext.scm")
+(scm-load "../lib/libgraphics.scm")
 
 ;; Composite dynamics ---------------------------------------------;
 (define dyn
diff --git a/lib/40-loadmacros.scm b/lib/40-loadmacros.scm
index 308aa14..6ac44df 100644
--- a/lib/40-loadmacros.scm
+++ b/lib/40-loadmacros.scm
@@ -64,7 +64,7 @@
           (begin
             (ly:debug-message "Loading macros file ~a..." x)
             ;; ugh.
-            (load (string-append "../" x))))
+            (scm-load (string-append "../" x))))
        (find-files dir ".scm$")))
 
 (define eval-macros
diff --git a/lib/50-loadthemes.scm b/lib/50-loadthemes.scm
index 82d5c3b..77e6cc0 100644
--- a/lib/50-loadthemes.scm
+++ b/lib/50-loadthemes.scm
@@ -17,7 +17,7 @@
 ;------------------------------------------------------------------;
 
 
-(load "liblayout.scm")
+(scm-load "liblayout.scm")
 
 (define-public (include-ly dir . hidden?)
   "Include all LilyPond code found in DIR, recursively.
diff --git a/lib/80-buildskel.scm b/lib/80-buildskel.scm
index 014289c..3556e75 100644
--- a/lib/80-buildskel.scm
+++ b/lib/80-buildskel.scm
@@ -17,7 +17,8 @@
 ;------------------------------------------------------------------;
 
 
-(load "libdynamics.scm")
+(scm-load "libdynamics.scm")
+(scm-load "libtext.scm")
 
 (define *has-timeline* (make-parameter #f))
 
diff --git a/lib/init.scm b/lib/init.scm
index c7199cb..f3c236b 100644
--- a/lib/init.scm
+++ b/lib/init.scm
@@ -87,6 +87,14 @@
         ret-ls))
     (sort (do-dir dir '()) string<?)))
 
+;; Loading files (similar to ly:load) -----------------------------;
+
+(define-public (scm-load file-name)
+  (ly:debug "[~A" file-name)
+  (load file-name)
+  (if (ly:get-option 'verbose)
+      (ly:progress "]\n")))
+
 ;; Automatic includes ---------------------------------------------;
 
 (define-public (include-scm dir . numbered?)
@@ -95,8 +103,7 @@
   (let* ((regx (if (not (false-or-null? numbered?)) "/[0-9].*\\.scm$" ".scm$"))
          (scm-files (find-files dir regx)))
     (map (lambda (x)
-           (begin (ly:debug-message "Loading ~a..." x)
-                  (load x)))
+           (scm-load x))
          scm-files)))
 
 ;------------------------------------------------------------------;
-- 
2.11.4.GIT