diff options
| -rw-r--r-- | elisp/geiser-autodoc.el | 2 | ||||
| -rw-r--r-- | elisp/geiser-compile.el | 3 | ||||
| -rw-r--r-- | elisp/geiser-edit.el | 2 | ||||
| -rw-r--r-- | elisp/geiser-syntax.el | 11 | ||||
| -rw-r--r-- | scheme/guile/geiser/introspection.scm | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el index 9c3c40b..4f4a43a 100644 --- a/elisp/geiser-autodoc.el +++ b/elisp/geiser-autodoc.el @@ -79,7 +79,7 @@ when `geiser-autodoc-display-module-p' is on." (geiser-eval--send `(:gs ((:ge arguments) ,@(mapcar (lambda (f) (list 'quote (car f))) funs))) 'geiser-autodoc--function-args-cont) - nil))) + ""))) (defun geiser-autodoc--function-args-cont (ret) (let ((result (geiser-eval--retort-result ret))) diff --git a/elisp/geiser-compile.el b/elisp/geiser-compile.el index ae7d43e..bb85637 100644 --- a/elisp/geiser-compile.el +++ b/elisp/geiser-compile.el @@ -76,8 +76,7 @@ (msg (format "%s %s ..." msg path))) (message msg) (geiser-compile--display-result -;; msg (geiser-eval--send/wait `(:gs ((:ge ,op) ,path) (geiser eval)))))) - msg (geiser-eval--send/wait `(compile-file ,path))))) + msg (geiser-eval--send/wait `(:gs ((:ge ,op) ,path) (geiser eval)))))) ;;; User commands: diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el index f0b854d..f34c800 100644 --- a/elisp/geiser-edit.el +++ b/elisp/geiser-edit.el @@ -63,7 +63,7 @@ (regexp-opt '("define" "defmacro" "define-macro" "define-syntax" "define*"))) (defsubst geiser-edit--def-re (symbol) - (format "(%s +(?%s" geiser-edit--def-re (regexp-quote (symbol-name symbol)))) + (format "(%s +(?%s\\_>" geiser-edit--def-re (regexp-quote (symbol-name symbol)))) (defsubst geiser-edit--symbol-re (symbol) (format "\\_<%s\\_>" (regexp-quote (symbol-name symbol)))) diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el index c192a1f..0218f06 100644 --- a/elisp/geiser-syntax.el +++ b/elisp/geiser-syntax.el @@ -75,11 +75,12 @@ (forward-char) (let ((proc (symbol-at-point)) (arg-no 0)) - (while (< (point) p) - (forward-sexp) - (when (< (point) p) (setq arg-no (1+ arg-no)))) - (push (cons proc arg-no) data))))) - (reverse (push current data))))) + (when proc + (while (< (point) p) + (forward-sexp) + (when (< (point) p) (setq arg-no (1+ arg-no)))) + (push (cons proc arg-no) data)))))) + (reverse (if (car current) (push current data) data))))) (defun geiser-syntax--prepare-scheme-for-elisp-reader () (goto-char (point-min)) diff --git a/scheme/guile/geiser/introspection.scm b/scheme/guile/geiser/introspection.scm index 62d3ce5..a158d66 100644 --- a/scheme/guile/geiser/introspection.scm +++ b/scheme/guile/geiser/introspection.scm @@ -37,9 +37,7 @@ (else (loop (car syms) (cdr syms)))))) (define (resolve-symbol sym) - (and (symbol? sym) - (module-bound? (current-module) sym) - (eval sym (current-module)))) + (module-ref (current-module) sym)) (define (obj-args obj) (cond ((not obj) #f) |