From 0824bbb3f5d2a2a3cec1111363d195e491f74037 Mon Sep 17 00:00:00 2001
From: Mikael Djurfeldt <djurfeldt@nada.kth.se>
Date: Mon, 30 Aug 1999 02:18:35 +0000
Subject: [PATCH] Moved scm_memoize_method back to eval.c.

---
 libguile/objects.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libguile/objects.c b/libguile/objects.c
index b1ad7a4a9..afd9af06b 100644
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -299,7 +299,7 @@ scm_mcache_lookup_cmethod (SCM cache, SCM args)
 	  }
 	while (--j && SCM_NIMP (ls));
       /* Fewer arguments than specifiers => CAR != ENV */
-      if (!SCM_CONSP (SCM_CAR (z)))
+      if (!(SCM_IMP (SCM_CAR (z)) || SCM_CONSP (SCM_CAR (z))))
 	goto next_method;
       return z;
     next_method:
@@ -308,8 +308,6 @@ scm_mcache_lookup_cmethod (SCM cache, SCM args)
   return SCM_BOOL_F;
 }
 
-SCM (*scm_memoize_method) (SCM, SCM);
-
 SCM
 scm_mcache_compute_cmethod (SCM cache, SCM args)
 {