Convert load calls to require

contrapunctus/cp-lily.el

@@ -11,14 +11,14 @@
    ("M-N"     . cp-lower-level)
    ("C-c C-w" . cp-ly-wrap-para))
   :commands LilyPond-mode
+  :load-path "../user/"
+  :mode (("\\.ly$"  . LilyPond-mode)
+         ("\\.ily$" . LilyPond-mode))
   :config
   (--map (add-hook 'LilyPond-mode-hook it)
          '(subword-mode
            (lambda () (turn-on-font-lock))))
   (defalias 'string-to-int #'string-to-number)
-  :load-path "../user/"
-  :mode (("\\.ly$"  . LilyPond-mode)
-         ("\\.ily$" . LilyPond-mode)))
 
   (defvar cp/ly-definition-rx
     '(and bol
@@ -159,8 +159,10 @@ TODO - wrap region if region active"
         ;; FIXME
         (goto-char (pcase arg
                      (0 point-a)
-                   (_ (- indent-start 2)))))))
+                     (_ (- indent-start 2))))))))
 
 ;; TODO - cp-ly-new-var, bind to M-RET.
 ;; Exits current variable body, if in any, and inserts "| = \relative
 ;; c {\n\n \n}", where | is the cursor
+
+(provide 'cp-lily)

contrapunctus/cp-sfz.el

@@ -24,3 +24,5 @@
 
 (define-key sfz-mode-map (kbd "M-p") 'sfz-prev-group)
 (define-key sfz-mode-map (kbd "M-n") 'sfz-next-group)
+
+(provide 'cp-sfz)

init.el

@@ -575,8 +575,8 @@ and eval it."
 (require 'cp-editing)
 ;; (load "cp-evil")
 (load "cp-fm")
-(load "cp-lily")
-(load "cp-sfz")
+(require 'cp-lily)
+(require 'cp-sfz)
 (require 'cp-prog)
 (require 'cp-lisp)
 (require 'cp-nav)