summaryrefslogtreecommitdiff
path: root/elisp
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
parent32cf1a718868d83b58b426ba7e1eeb32ea9f80b5 (diff)
downloadgeiser-guile-512fa06fec02b7dc8ce11684313f7a0ab56bef6b.tar.gz
geiser-guile-512fa06fec02b7dc8ce11684313f7a0ab56bef6b.tar.bz2
Elisp buggettes and warnings
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-connection.el2
-rw-r--r--elisp/geiser-guile.el7
-rw-r--r--elisp/geiser-mode.el4
3 files changed, 7 insertions, 6 deletions
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 5305cd8..f146563 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -112,7 +112,7 @@ By default, Geiser uses the prompt regexp.")
(cdr (assoc :reply c)))
(defsubst geiser-con--connection-completed (c r)
- (geiser-con--request-deactivate req)
+ (geiser-con--request-deactivate r)
(puthash (geiser-con--request-id r) r (cdr (assoc :completed c))))
(defun geiser-con--connection-clean-current-request (c)
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))
diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el
index 1645ba2..719176d 100644
--- a/elisp/geiser-mode.el
+++ b/elisp/geiser-mode.el
@@ -184,7 +184,7 @@ positive values and backward for negative."
(let ((pared (and (boundp 'paredit-mode) paredit-mode))
(fwd (> n 0))
(steps (abs n)))
- (when pared (paredit-mode -1))
+ (when (and pared (fboundp 'paredit-mode)) (paredit-mode -1))
(unwind-protect
(save-excursion
(unless (looking-at-p "\\s(") (backward-up-list))
@@ -203,7 +203,7 @@ positive values and backward for negative."
(progn (when fwd (forward-sexp 2))
(backward-sexp))
(error (setq steps 0))))))
- (when pared (paredit-mode 1)))))
+ (when (and pared (fboundp 'paredit-mode)) (paredit-mode 1)))))
;;; Geiser mode: