summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-11 20:56:58 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-11 20:56:58 +0100
commitbfd6b0f3d7f1472abc7411a4cafb8cb7619c9a8f (patch)
tree328ae7c41133110cfe79b0bb44aa8c1e81dabb17
parent15fd33fcc8b5d22d259351a7034e496a02f48814 (diff)
downloadgeiser-bfd6b0f3d7f1472abc7411a4cafb8cb7619c9a8f.tar.gz
geiser-bfd6b0f3d7f1472abc7411a4cafb8cb7619c9a8f.tar.bz2
Don't let (ice-9 history) confuse the evaluator.
-rw-r--r--elisp/geiser-connection.el1
-rw-r--r--elisp/geiser-syntax.el5
2 files changed, 4 insertions, 2 deletions
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index c18e7b2..7a73adc 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -160,7 +160,6 @@
(defun geiser-con--comint-buffer-form ()
(with-current-buffer (geiser-con--comint-buffer)
(geiser-syntax--prepare-scheme-for-elisp-reader)
- (goto-char (point-min))
(condition-case nil
(let ((form (read (current-buffer))))
(if (listp form) form (error)))
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 32b28bb..2199cc5 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -93,7 +93,10 @@
(goto-char (point-min))
(while (re-search-forward "#(" nil t) (replace-match "(vector "))
(goto-char (point-min))
- (while (re-search-forward "#" nil t) (replace-match "\\\\#")))
+ (while (re-search-forward "#" nil t) (replace-match "\\\\#"))
+ (goto-char (point-min))
+ (skip-syntax-forward "^("))
+)