From 85838e68615303ec37832272a398fa8d4f474962 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Tue, 16 Jun 2009 23:15:16 +0200 Subject: Fixes in retort parsing. --- elisp/geiser-connection.el | 4 ++-- elisp/geiser-impl.el | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'elisp') 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: -- cgit v1.2.3