Merge branch 'master' into guile-meta

1 files changed, 7 insertions, 6 deletions

diff --git a/scheme/guile/geiser/doc.scm b/scheme/guile/geiser/doc.scm
index f5471b5..902f2a3 100644
--- a/scheme/guile/geiser/doc.scm
+++ b/scheme/guile/geiser/doc.scm
@@ -66,16 +66,17 @@
         (else 'variable)))
 
 (define (arguments proc)
-  (define (p-arguments prog)
-    (map (lambda (a) ((@@ (system vm program) arity->arguments-alist) prog a))
-         (or (program-arities prog) '())))
+  (define (p-args prog)
+    (let ((as (map (lambda (a)
+                     ((@@ (system vm program) arity->arguments-alist) prog a))
+                     (or (program-arities prog) '()))))
+      (and (not (null? as)) as)))
   (define (clist f) (lambda (x) (let ((y (f x))) (and y (list y)))))
   (cond ((is-a? proc <generic>) (generic-args proc))
+        ((doc->args proc) => list)
         ((procedure-property proc 'arglist) => (clist arglist->args))
         ((procedure-source proc) => (clist source->args))
-        ((doc->args proc) => list)
-        ((program? proc) (let ((a (p-arguments proc)))
-                           (and (not (null? a)) a)))
+        ((and (program? proc) (p-args proc)))
         ((procedure-property proc 'arity) => (clist arity->args))
         (else #f)))