summaryrefslogtreecommitdiff
path: root/scheme/guile
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-06-04 14:42:57 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2013-06-04 14:50:22 +0200
commit99e1cb68577896b2d1afcc9b6ab52e5c6a3a523f (patch)
tree7bf9ca5fdede2ced0a5c49e238d199d2f7de0828 /scheme/guile
parent7613969054120384af99e9d6115cd4667b65c553 (diff)
downloadgeiser-guile-99e1cb68577896b2d1afcc9b6ab52e5c6a3a523f.tar.gz
geiser-guile-99e1cb68577896b2d1afcc9b6ab52e5c6a3a523f.tar.bz2
Guile: Fix subr argument name retrieval for Guile >= 2.0.9.
Diffstat (limited to 'scheme/guile')
-rw-r--r--scheme/guile/geiser/doc.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/scheme/guile/geiser/doc.scm b/scheme/guile/geiser/doc.scm
index ebb8e1d..185b204 100644
--- a/scheme/guile/geiser/doc.scm
+++ b/scheme/guile/geiser/doc.scm
@@ -129,8 +129,11 @@
(rest . ,(car (cddddr arglist)))))
(define (doc->args proc)
- (define proc-rx "-- Scheme Procedure: ([^[\n]+)\n")
- (define proc-rx2 "-- Scheme Procedure: ([^[\n]+\\[[^\n]*(\n[^\n]+\\]+)?)")
+ ;; Guile 2.0.9+ uses the (texinfo ...) modules to produce
+ ;; `guile-procedures.txt', and the output has a single hyphen, whereas
+ ;; `makeinfo' produces two hyphens.
+ (define proc-rx "--? Scheme Procedure: ([^[\n]+)\n")
+ (define proc-rx2 "--? Scheme Procedure: ([^[\n]+\\[[^\n]*(\n[^\n]+\\]+)?)")
(let ((doc (object-documentation proc)))
(and doc
(let ((match (or (string-match proc-rx doc)