Import Upstream version 3a5upstream/3a5

1 files changed, 3 insertions, 5 deletions

diff --git a/dbinterp.scm b/dbinterp.scm
index 2bd4e20..3444fbb 100644
--- a/dbinterp.scm
+++ b/dbinterp.scm
@@ -17,12 +17,10 @@
 ;promotional, or sales literature without prior written consent in
 ;each case.
 
-(require 'rev4-optional-procedures)	; list-tail
-
 ;;; The procedures returned by MEMOIZE are not reentrant!
 (define (dbinterp:memoize proc k)
   (define recent (vector->list (make-vector k '(#f))))
-  (let ((tailr (list-tail recent (+ -1 k))))
+  (let ((tailr (last-pair recent)))
     (lambda args
       (define asp (assoc args recent))
       (if asp
@@ -35,8 +33,8 @@
 
 ;;@ This procedure works only for tables with a single primary key.
 (define (interpolate-from-table table column)
-  (define get  (dbinterp:memoize (table 'get column) 3))
-  (define prev (dbinterp:memoize (table 'isam-prev) 3))
+  (define get  (table 'get column))
+  (define prev (table 'isam-prev))
   (define next (table 'isam-next))
   (dbinterp:memoize
    (lambda (x)