summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-09 12:32:30 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-09 12:32:30 +0100
commit1099d5bb6da7b6d03f2f5a4f70d0a8c4bec5ceac (patch)
tree01c2f0edba398350915b6e6ea60a4ad8345d458b /elisp
parent6f7e0e15ac672b13efce7be815d4c550d3ecdf16 (diff)
downloadgeiser-chez-1099d5bb6da7b6d03f2f5a4f70d0a8c4bec5ceac.tar.gz
geiser-chez-1099d5bb6da7b6d03f2f5a4f70d0a8c4bec5ceac.tar.bz2
Don't echo any autodoc info when arity is not available.
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-autodoc.el9
-rw-r--r--elisp/geiser-syntax.el17
2 files changed, 13 insertions, 13 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index cff5794..4c6c44c 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -61,9 +61,9 @@
(cdr geiser-autodoc--last)
(let* ((cmd `(:gs ((:ge proc-args) ',fun)))
(result (geiser-eval--retort-result (geiser-eval--send/wait cmd))))
- (when (and (not (eq result :f)) (listp result))
- (setq geiser-autodoc--last (cons fun result))
- result))))
+ (when (not (listp result)) (setq result 'undefined))
+ (setq geiser-autodoc--last (cons fun result))
+ result)))
(defun geiser-autodoc--insert (sym current pos)
(let ((str (format "%s" sym)))
@@ -99,7 +99,8 @@
(arg-no (cdr f/a)))
(when fun
(let ((args (geiser-autodoc--function-args fun)))
- (geiser-autodoc--fun-args-str fun args arg-no)))))
+ (when (listp args)
+ (geiser-autodoc--fun-args-str fun args arg-no))))))
;;; Autodoc mode:
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 9a476ce..fa8e9b2 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -68,15 +68,14 @@
(let ((p (geiser-syntax--end-of-thing))
(arg-no 0)
(proc))
- (condition-case nil
- (progn (backward-up-list)
- (forward-char)
- (setq proc (symbol-at-point))
- (while (< (point) p)
- (forward-sexp)
- (when (< (point) p) (setq arg-no (1+ arg-no))))
- (cons proc arg-no))
- (error nil)))))
+ (ignore-errors
+ (backward-up-list)
+ (forward-char)
+ (setq proc (symbol-at-point))
+ (while (< (point) p)
+ (forward-sexp)
+ (when (< (point) p) (setq arg-no (1+ arg-no))))
+ (cons proc arg-no)))))
;;; Fontify strings as Scheme code: