From 279a07ef71cfb43f97192e059e35d4147f9074e5 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Mon, 9 Feb 2009 12:32:30 +0100 Subject: Don't echo any autodoc info when arity is not available. --- elisp/geiser-autodoc.el | 9 +++++---- elisp/geiser-syntax.el | 17 ++++++++--------- 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: -- cgit v1.2.3