Fix typo in list-element-index, simplify count-list

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index ecf5a4598fe6ee66c3347c9ba5613731989aaddb..5b39cc46ffdfc91255c64951a461bd974ecbf2e2 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -541,19 +541,12 @@ For example:
   (helper lst (make-vector n '()) (1- n)))
 
 (define (list-element-index lst x)
-  (list-index (lambda (m) (equal? m x))))
+  (list-index (lambda (m) (equal? m x)) lst))
 
 (define-public (count-list lst)
   "Given @var{lst} as @code{(E1 E2 .. )}, return
 @code{((E1 . 1) (E2 . 2) ... )}."
-
-  (define (helper l acc count)
-    (if (pair? l)
-       (helper (cdr l) (cons (cons (car l) count) acc) (1+ count))
-       acc))
-
-
-  (reverse (helper lst '() 1)))
+  (map cons lst (iota (length lst) 1)))
 
 (define-public (list-join lst intermediate)
   "Put @var{intermediate} between all elts of @var{lst}."