branch: elpa/geiser-guile
commit 6c9efbc61592aa24429d5c29b641b7f1ff1eff51
Author: Ludovic Courtès <[email protected]>
Commit: Jose Antonio Ortega Ruiz <[email protected]>
Guile: Fix subr argument name retrieval for Guile >= 2.0.9.
---
geiser/doc.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/geiser/doc.scm b/geiser/doc.scm
index ebb8e1d..185b204 100644
--- a/geiser/doc.scm
+++ b/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)
