diff --git a/ChangeLog b/ChangeLog index 72e755b023..cb70a28ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-04-09 Dave Peticolas + * src/scm/srfi/srfi-1.r5rs.scm: renamed 'list-index' to + 'list-index-pred'. guile-1.3.4 defines a list-index with + different api and semantics. + * configure.in: make gnucash.spec configured * rpm/gnucash.spec.in: new file, same as old gnucash.spec, but diff --git a/src/scm/report.scm b/src/scm/report.scm index e878eaa2a3..fb9c1b808a 100644 --- a/src/scm/report.scm +++ b/src/scm/report.scm @@ -1,5 +1,6 @@ (require 'hash-table) +(require 'record) (gnc:support "report.scm") ;; We use a hash to store the report info so that whenever a report is diff --git a/src/scm/srfi/srfi-1.r5rs.scm b/src/scm/srfi/srfi-1.r5rs.scm index 7fe29b2015..d9d247be33 100644 --- a/src/scm/srfi/srfi-1.r5rs.scm +++ b/src/scm/srfi/srfi-1.r5rs.scm @@ -41,7 +41,7 @@ ;;; append-map append-map! map! pair-for-each filter-map map-in-order ;;; filter partition remove ;;; filter! partition! remove! -;;; find find-tail any every list-index +;;; find find-tail any every list-index-pred ;;; take-while drop-while take-while! ;;; span break span! break! ;;; delete delete! @@ -1293,7 +1293,7 @@ (filter! (lambda (elt) (not (= key (car elt)))) alist))) -;;; find find-tail take-while drop-while span break any every list-index +;;; find find-tail take-while drop-while span break any every list-index-pred ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (find pred list) @@ -1406,8 +1406,8 @@ (pred head) ; Last PRED app is tail call. (and (pred head) (lp (car tail) (cdr tail)))))))) -(define (list-index pred lis1 . lists) - (srfi-1:check-arg procedure? pred list-index) +(define (list-index-pred pred lis1 . lists) + (srfi-1:check-arg procedure? pred list-index-pred) (if (pair? lists) ;; N-ary case