summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-autodoc.el3
-rw-r--r--elisp/geiser-edit.el19
2 files changed, 16 insertions, 6 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 924fadb..f18a6ed 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -185,7 +185,8 @@ you can set this variable to nil to avoid them."
(s))
(while (and p (not s))
(setq s (or (cdr (assoc (car p) signs))
- (cdr (geiser-edit--find-def (car p)))))
+ (and geiser-mode
+ (cdr (geiser-edit--find-def (car p) t)))))
(unless s (setq p (car path) path (cdr path))))
(cond ((stringp s) s)
(s (geiser-autodoc--str p s)))))))
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index f2ed57a..06340fb 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -89,7 +89,10 @@ or following links in error buffers.")
(defsubst geiser-edit--def-re (thing)
(let ((sx (regexp-quote (format "%s" thing))))
- (format "(%s[[:space:]]+\\((%s\\_>[^)]*)\\|\\(\\_<%s\\_>\\) *\\([^\n]*\\))\\)"
+ (format (concat "(%s[[:space:]]+\\("
+ "(%s\\_>[^)]*)\\|"
+ "\\(\\_<%s\\_>\\) *\\([^\n]*?\\)[)\n]"
+ "\\)")
geiser-edit--def-re sx sx)))
(defsubst geiser-edit--def-re* (thing)
@@ -97,15 +100,21 @@ or following links in error buffers.")
geiser-edit--def-re*
(regexp-quote (format "%s" thing))))
-(defun geiser-edit--find-def (symbol)
+(defun geiser-edit--find-def (symbol &optional args)
(save-excursion
(goto-char (point-min))
(when (or (re-search-forward (geiser-edit--def-re symbol) nil t)
(re-search-forward (geiser-edit--def-re* symbol) nil t))
(cons (match-beginning 0)
- (if (match-string 2)
- (concat (match-string 2) " => " (match-string 3))
- (match-string 1))))))
+ (and args
+ (if (match-string 2)
+ (let* ((v (or (match-string 3) ""))
+ (v (and (not (string-blank-p v)) v)))
+ (concat (match-string 2)
+ (and v " => ")
+ v
+ (and v (string-prefix-p "(" v) " ...")))
+ (match-string 1)))))))
(defsubst geiser-edit--symbol-re (thing)
(format "\\_<%s\\_>" (regexp-quote (format "%s" thing))))