diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2009-09-07 00:23:17 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2009-09-07 00:23:17 +0200 |
| commit | 8f5e58189692663901266dc83f2e2b4e47803b8d (patch) | |
| tree | af04cbe37abec51cbf4106f06a497445904dc7a6 /elisp/geiser-connection.el | |
| parent | 61edb258a45d5ad00ee907594c6dfbcd21d93485 (diff) | |
| parent | 3a80af06f2b9272db379fed3b5b659ecfeeceb70 (diff) | |
| download | geiser-guile-8f5e58189692663901266dc83f2e2b4e47803b8d.tar.gz geiser-guile-8f5e58189692663901266dc83f2e2b4e47803b8d.tar.bz2 | |
Merge branch 'devel'
Diffstat (limited to 'elisp/geiser-connection.el')
| -rw-r--r-- | elisp/geiser-connection.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el index 33579f6..4f8592b 100644 --- a/elisp/geiser-connection.el +++ b/elisp/geiser-connection.el @@ -160,11 +160,15 @@ (defun geiser-con--comint-buffer-form () (with-current-buffer (geiser-con--comint-buffer) - (geiser-syntax--prepare-scheme-for-elisp-reader) (condition-case nil - (let ((form (read (current-buffer)))) - (if (listp form) form (error))) - (error `((error (key . geiser-con-error) (msg . ,(buffer-string)))))))) + (progn + (goto-char (point-min)) + (re-search-forward "((\\(result\\|error\\)\\>") + (goto-char (match-beginning 0)) + (let ((form (read (current-buffer)))) + (if (listp form) form (error)))) + (error `((error (key . geiser-con-error)) + (output . ,(buffer-string))))))) (defun geiser-con--process-next (con) (when (not (geiser-con--connection-current-request con)) |