summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-06-16 23:15:16 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-06-16 23:15:16 +0200
commit85838e68615303ec37832272a398fa8d4f474962 (patch)
treea6d921b1f8ba2654600dd67a6e21bbf3a5923c14
parent631d43de316ac010ac8d8bcc165b64dd75a328a1 (diff)
downloadgeiser-85838e68615303ec37832272a398fa8d4f474962.tar.gz
geiser-85838e68615303ec37832272a398fa8d4f474962.tar.bz2
Fixes in retort parsing.
-rw-r--r--elisp/geiser-connection.el4
-rw-r--r--elisp/geiser-impl.el3
2 files changed, 4 insertions, 3 deletions
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 33668e0..8090247 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -163,12 +163,12 @@
(condition-case nil
(progn
(goto-char (point-min))
- (re-search-forward "((\\(result\\|error\\) ")
+ (re-search-forward "((\\(result\\|error\\)\\>")
(goto-char (match-beginning 0))
(geiser-syntax--prepare-scheme-for-elisp-reader)
(let ((form (read (current-buffer))))
(if (listp form) form (error))))
- (error `((error (key . geiser-con-error) (msg . ,(buffer-string))))))))
+ (error `((error (key . geiser-con-error)) (output . ,(buffer-string)))))))
(defun geiser-con--process-next (con)
(when (not (geiser-con--connection-current-request con))
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index d45fadc..38c34ee 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -171,7 +171,8 @@
(geiser-impl--call-if-bound (geiser-impl--default-implementation)
"geiser-procedure"
proc))
-(set-default 'geiser-eval--geiser-procedure-function 'geiser-impl-geiser-procedure)
+(set-default 'geiser-eval--geiser-procedure-function
+ 'geiser-impl-geiser-procedure)
;;; Access to implementation specific execution parameters: