summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-08-07 00:11:52 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-08-07 00:11:52 +0200
commit94be6173b640411e8205778fc7e080f6fbdac9dc (patch)
tree529aa770c5eb1f7fcc392e077484719e92238831
parentd3df979d3e02bc68c36a9b243881a3ad638e3af9 (diff)
downloadgeiser-chez-94be6173b640411e8205778fc7e080f6fbdac9dc.tar.gz
geiser-chez-94be6173b640411e8205778fc7e080f6fbdac9dc.tar.bz2
kludgy fix for opt/key/rest markers in autodoc
-rw-r--r--elisp/geiser-autodoc.el6
-rw-r--r--scheme/guile/geiser/doc.scm6
-rw-r--r--scheme/plt/geiser/autodoc.ss6
3 files changed, 9 insertions, 9 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index f6d36a8..0449032 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -97,10 +97,10 @@ when `geiser-autodoc-display-module-p' is on."
(defun geiser-autodoc--insert-arg (arg current pos)
(let ((p (point))
- (str (format "%s" (if (eq arg '\#:rest) "." arg)))
- (face (cond ((eq '\#:opt arg)
+ (str (format "%s" (if (eq arg 'geiser-rest_marker) "." arg)))
+ (face (cond ((eq 'geiser-opt_marker arg)
'geiser-font-lock-autodoc-optional-arg-marker)
- ((eq '\#:key arg)
+ ((eq 'geiser-key_marker arg)
'geiser-font-lock-autodoc-key-arg-marker)
((= current pos)
'geiser-font-lock-autodoc-current-arg)
diff --git a/scheme/guile/geiser/doc.scm b/scheme/guile/geiser/doc.scm
index c61502e..e7640e6 100644
--- a/scheme/guile/geiser/doc.scm
+++ b/scheme/guile/geiser/doc.scm
@@ -76,9 +76,9 @@
(key (arglst args 'keyword))
(rest (assq-ref args 'rest)))
(let ((sgn `(,fun ,@req
- ,@(if (not (null? opt)) (cons #:opt opt) '())
- ,@(if (not (null? key)) (cons #:key key) '()))))
- (if rest `(,@sgn #:rest ,rest) sgn))))
+ ,@(if (not (null? opt)) (cons 'geiser-opt_marker opt) '())
+ ,@(if (not (null? key)) (cons 'geiser-key_maker key) '()))))
+ (if rest `(,@sgn 'geiser-rest_marker ,rest) sgn))))
(define (find-position args form)
(let* ((lf (length form))
diff --git a/scheme/plt/geiser/autodoc.ss b/scheme/plt/geiser/autodoc.ss
index 73ed24d..6607a94 100644
--- a/scheme/plt/geiser/autodoc.ss
+++ b/scheme/plt/geiser/autodoc.ss
@@ -176,9 +176,9 @@
(rest (signature-rest sign)))
`(,fun
,@req
- ,@(if (null? opt) opt (cons '#:opt opt))
- ,@(if (null? keys) keys (cons '#:key keys))
- ,@(if rest (list '#:rest rest) '()))))
+ ,@(if (null? opt) opt (cons 'geiser-opt_marker opt))
+ ,@(if (null? keys) keys (cons 'geiser-key_maker keys))
+ ,@(if rest (list 'geiser-rest_marker rest) '()))))
(else #f)))
(define (find-position sign form)