summaryrefslogtreecommitdiff
path: root/elisp/geiser-autodoc.el
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-03-02 23:01:17 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-03-02 23:01:17 +0100
commita4358aa381d45b1c05bea5c8545a108a7bc20123 (patch)
tree37aed4c0f492d70300426f0210cd163763da3e07 /elisp/geiser-autodoc.el
parent0085c16dc3add5722e86c738c0ff1fa969183d86 (diff)
downloadgeiser-a4358aa381d45b1c05bea5c8545a108a7bc20123.tar.gz
geiser-a4358aa381d45b1c05bea5c8545a108a7bc20123.tar.bz2
Autodoc enhancements:
* Use argument names from guile-procedures.txt when available. * Highlihgt #:opt with a face of its own.
Diffstat (limited to 'elisp/geiser-autodoc.el')
-rw-r--r--elisp/geiser-autodoc.el16
1 files changed, 12 insertions, 4 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 4e8a5bf..d6424b4 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -46,6 +46,10 @@
'font-lock-function-name-face
geiser-autodoc "highlighting procedure name in autodoc messages")
+(geiser-custom--defface autodoc-optional-arg-marker
+ 'font-lock-keyword-face
+ geiser-autodoc "highlighting #:opt marker in autodoc messages")
+
(defcustom geiser-autodoc-delay 0.2
"Delay before autodoc messages are fetched and displayed, in seconds."
:type 'number
@@ -75,7 +79,8 @@ when `geiser-autodoc-display-module-p' is on."
(if (equal (car geiser-autodoc--last) form) (cdr geiser-autodoc--last)
(when form
(let ((res (geiser-eval--send/result
- `(:eval ((:ge autodoc) (quote (:scm ,form)))))))
+ `(:eval ((:ge autodoc) (quote (:scm ,form))))
+ 500)))
(when (and res (listp res))
(setq geiser-autodoc--last
(cons form
@@ -86,14 +91,17 @@ 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))))
+ (str (format "%s" (if (eq arg '\#:rest) "." arg)))
+ (face (or (and (eq '\#:opt arg)
+ 'geiser-font-lock-autodoc-optional-arg-marker)
+ (and (= current pos)
+ 'geiser-font-lock-autodoc-current-arg))))
(insert str)
(when (listp arg)
(save-excursion
(replace-regexp "(quote \\(.*\\))" "'\\1" nil p (point))
(replace-string "nil" "()" t p (point))))
- (when (= current pos)
- (put-text-property p (point) 'face 'geiser-font-lock-autodoc-current-arg))))
+ (when face (put-text-property p (point) 'face face))))
(defsubst geiser-autodoc--proc-name (proc module)
(let ((str (if module