From 384d21f43db11f8c3072c9bb99b75e6341e23691 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sun, 31 Oct 2010 02:34:30 +0100
Subject: Autodoc: fix for improper macro arglists scanning

---
 geiser/doc.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/geiser/doc.scm b/geiser/doc.scm
index 4722238..f5471b5 100644
--- a/geiser/doc.scm
+++ b/geiser/doc.scm
@@ -87,12 +87,14 @@
           (else #f))))
 
 (define (macro-args tf)
+  (define* (collect args #:optional (req '()))
+    (cond ((null? args) (arglist->args `(,(reverse req) #f #f r #f)))
+          ((symbol? args) (arglist->args `(,(reverse req) #f #f r ,args)))
+          ((and (pair? args) (symbol? (car args)))
+           (collect (cdr args) (cons (car args) req)))
+          (else #f)))
   (let* ((pats (procedure-property tf 'patterns))
-         (args (and pats (filter identity
-                                 (map (lambda (p)
-                                        (and (every symbol? p)
-                                             (list (cons 'required p))))
-                                      pats)))))
+         (args (and pats (filter-map collect pats))))
     (or (and args (not (null? args)) args) default-macro-args)))
 
 (define (arity->args art)
-- 
cgit v1.2.3


From 04fd67faa12cb2212dbd6004889fa59aa52a650d Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sun, 31 Oct 2010 15:13:19 +0100
Subject: Always fallback to edit-module in M-.

---
 geiser/doc.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/geiser/doc.scm b/geiser/doc.scm
index f5471b5..902f2a3 100644
--- a/geiser/doc.scm
+++ b/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)))
 
-- 
cgit v1.2.3