summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-04-01 03:33:59 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-04-01 03:33:59 +0200
commit5685fad662ea2568a8e16dcfdc709f1476abd15c (patch)
treedccc3d9382b5490bc28529f72b5fefba74ed2f23 /elisp
parente6561280d19f32a9d556f729a5bfefabb950e79f (diff)
downloadgeiser-chez-5685fad662ea2568a8e16dcfdc709f1476abd15c.tar.gz
geiser-chez-5685fad662ea2568a8e16dcfdc709f1476abd15c.tar.bz2
Using the scheme reader to read modules names.
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-guile.el3
-rw-r--r--elisp/geiser-plt.el5
2 files changed, 5 insertions, 3 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index db4b27d..0bbf9b7 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -86,7 +86,8 @@ This function uses `geiser-guile-init-file' if it exists."
:f)))
((listp module) module)
((stringp module)
- (or (ignore-errors (car (read-from-string module))) :f))
+ (or (ignore-errors
+ (car (geiser-syntax--read-from-string module))) :f))
(t :f)))
(defun geiser-guile--enter-command (module)
diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el
index 6a804f2..52af728 100644
--- a/elisp/geiser-plt.el
+++ b/elisp/geiser-plt.el
@@ -72,7 +72,7 @@ This function uses `geiser-plt-init-file' if it exists."
(goto-char (point-min))
(if (re-search-forward
"^\\(?:#lang\\|(module +[^ ]+?\\) +\\([^ ]+?\\|([^)]+)\\) *$" nil t)
- (car (read-from-string (match-string-no-properties 1)))
+ (car (geiser-syntax--read-from-string (match-string-no-properties 1)))
:f)))
(defun geiser-plt--geiser-procedure (proc)
@@ -88,7 +88,8 @@ This function uses `geiser-plt-init-file' if it exists."
(goto-char (point-min))
(and (re-search-forward geiser-plt--module-re nil t)
(ignore-errors
- (car (read-from-string (match-string-no-properties 1)))))))
+ (car (geiser-syntax--read-from-string
+ (match-string-no-properties 1)))))))
(defsubst geiser-plt--implicit-module ()
(save-excursion