summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-chicken.el5
-rw-r--r--elisp/geiser-connection.el2
2 files changed, 4 insertions, 3 deletions
diff --git a/elisp/geiser-chicken.el b/elisp/geiser-chicken.el
index a68ab7b..88d60cf 100644
--- a/elisp/geiser-chicken.el
+++ b/elisp/geiser-chicken.el
@@ -143,8 +143,9 @@ This function uses `geiser-chicken-init-file' if it exists."
(defun geiser-chicken--geiser-procedure (proc &rest args)
(case proc
((eval compile)
- (let ((form (mapconcat 'identity (cdr args) " ")))
- (format "(geiser-eval %s '%s)" (or (car args) "#f") form)))
+ (let ((form (mapconcat 'identity (cdr args) " "))
+ (module (if (car args) (concat "'" (car args)) "#f")))
+ (format "(geiser-eval %s '%s)" module form)))
((load-file compile-file)
(format "(geiser-load-file %s)" (car args)))
((no-values)
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index e466cd3..8a3de31 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -202,7 +202,7 @@
`((error (key . geiser-debugger))
(output . ,answer))
(condition-case err
- (let ((start (string-match "((\\(?:result)?\\|error\\) " answer)))
+ (let ((start (string-match "((\\(?:result)?\\|error\\|Error\\) " answer)))
(or (and start (car (read-from-string answer start)))
`((error (key . retort-syntax)) (output . ,answer))))
(error `((error (key . geiser-con-error))