summaryrefslogtreecommitdiff
path: root/elisp/geiser-guile.el
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-09 02:38:49 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-09 02:38:49 +0100
commit512fa06fec02b7dc8ce11684313f7a0ab56bef6b (patch)
tree61a4d0506e7e99f39d4b2e77d6b99321b7b8840e /elisp/geiser-guile.el
parent32cf1a718868d83b58b426ba7e1eeb32ea9f80b5 (diff)
downloadgeiser-guile-512fa06fec02b7dc8ce11684313f7a0ab56bef6b.tar.gz
geiser-guile-512fa06fec02b7dc8ce11684313f7a0ab56bef6b.tar.bz2
Elisp buggettes and warnings
Diffstat (limited to 'elisp/geiser-guile.el')
-rw-r--r--elisp/geiser-guile.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index f13fab6..1c39f14 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -139,8 +139,9 @@ This function uses `geiser-guile-init-file' if it exists."
:f)))
((listp module) module)
((stringp module)
- (or (ignore-errors (car (geiser-syntax--read-from-string module)))
- :f))
+ (condition-case nil
+ (car (geiser-syntax--read-from-string module))
+ (error :f)))
(t :f)))
(defun geiser-guile--module-cmd (module fmt &optional def)
@@ -251,7 +252,7 @@ it spawn a server thread."
(font-lock-add-keywords nil
`((,geiser-guile--path-rx 1
compilation-error-face)))
- (geiser-eval--send/result
+ (geiser-eval--send/wait
`(:scm ,(format "(set! %%load-path (cons %S %%load-path))"
(expand-file-name "guile/" geiser-scheme-dir))))
(geiser-guile-update-warning-level))