summaryrefslogtreecommitdiff
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
commita77bf8bc32f6c795b4399699e5bdc56518d7c3ff (patch)
treef49427d26f71e0f85c9c5913ebc1b39f32c36bec
parentd2d5f62786add57cec8e48782b84a8a45c0f5b78 (diff)
downloadgeiser-guile-a77bf8bc32f6c795b4399699e5bdc56518d7c3ff.tar.gz
geiser-guile-a77bf8bc32f6c795b4399699e5bdc56518d7c3ff.tar.bz2
Elisp buggettes and warnings
-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))