diff options
| -rw-r--r-- | elisp/geiser-guile.el | 2 | ||||
| -rw-r--r-- | scheme/guile/geiser/emacs.scm | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el index c406d88..8f8d7af 100644 --- a/elisp/geiser-guile.el +++ b/elisp/geiser-guile.el @@ -185,7 +185,7 @@ This function uses `geiser-guile-init-file' if it exists." (if geiser-guile-debug-show-bt-p "bt" "fr")))) (compilation-forget-errors) (goto-char (point-max)) - (comint-send-string nil "((@ (geiser emacs) ge:newline))\n") + (comint-send-string nil ",geiser-newline\n") (comint-send-string nil ",error-message\n") (comint-send-string nil bt-cmd) (when geiser-guile-show-debug-help-p diff --git a/scheme/guile/geiser/emacs.scm b/scheme/guile/geiser/emacs.scm index ba6b100..73c02d0 100644 --- a/scheme/guile/geiser/emacs.scm +++ b/scheme/guile/geiser/emacs.scm @@ -12,6 +12,7 @@ (define-module (geiser emacs) #:use-module (ice-9 match) #:use-module (system repl command) + #:use-module (system repl error-handling) #:use-module (geiser evaluation) #:use-module ((geiser modules) :renamer (symbol-prefix-proc 'ge:)) #:use-module ((geiser completion) :renamer (symbol-prefix-proc 'ge:)) @@ -29,11 +30,18 @@ No-op command used internally by Geiser." "geiser-eval Meta-command used by Geiser to evaluate and compile code." (if (null? args) - (ge:compile form mod) + (call-with-error-handling + (lambda () (ge:compile form mod))) (let ((proc (eval form this-module))) (ge:eval `(,proc ,@args) mod)))) (define-meta-command ((geiser-load-file geiser) repl file) "geiser-load-file Meta-command used by Geiser to load and compile files." - (ge:compile-file file)) + (call-with-error-handling + (lambda () (ge:compile-file file)))) + +(define-meta-command ((geiser-newline geiser) repl) + "geiser-newline +Meta-command used by Geiser to emit a new line." + (newline)) |