summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-05-24 05:00:58 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-05-24 05:00:58 +0200
commitf0ff37dc07075298043a8b5319867d355f41a773 (patch)
tree772d811e8f9f56d74d33fb65bce4b9318e83d0d7
parent185abd5871b99d3642ee43db0d8590e54d66f898 (diff)
downloadgeiser-guile-f0ff37dc07075298043a8b5319867d355f41a773.tar.gz
geiser-guile-f0ff37dc07075298043a8b5319867d355f41a773.tar.bz2
Elisp: misc little bugs (revealed by the byte compiler) fixed.
-rw-r--r--elisp/geiser-completion.el7
-rw-r--r--elisp/geiser-racket.el2
-rw-r--r--elisp/geiser-repl.el2
-rw-r--r--elisp/geiser-syntax.el2
4 files changed, 7 insertions, 6 deletions
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index 09c021f..b58b6be 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -101,9 +101,10 @@ terminates a current completion."
(get-buffer-window geiser-completion--comp-buffer)))))
(defun geiser-completion--display-or-scroll (completions base)
- (cond ((and (eq last-command this-command) (geiser-completion--window-active-p))
- (geiser-completion--scroll-completions))
- (t (geiser-completion--display-comp-list completions base)))
+ (if (and (eq last-command this-command)
+ (geiser-completion--window-active-p))
+ (geiser-completion--scroll-completions)
+ (geiser-completion--display-comp-list completions base))
(geiser-completion--delay-restoration))
(defun geiser-completion--scroll-completions ()
diff --git a/elisp/geiser-racket.el b/elisp/geiser-racket.el
index dd086a5..e5f8780 100644
--- a/elisp/geiser-racket.el
+++ b/elisp/geiser-racket.el
@@ -134,7 +134,7 @@ This function uses `geiser-racket-init-file' if it exists."
(let ((out (geiser-eval--retort-output
(geiser-racket--get-help id module))))
(when (and out (string-match " but provided by:\n +\\(.+\\)\n" out))
- (geiser-racket--get-help symbol (match-string 1 out))))
+ (geiser-racket--get-help id (match-string 1 out))))
(minibuffer-message "%s done" (current-message))
t)
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index b7401b9..7de90ec 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -339,7 +339,7 @@ module command as a string")
(defun geiser-repl--nesting-level ()
(let ((begin (if comint-last-prompt-overlay
(overlay-end comint-last-prompt-overlay)
- (save-excusion (geiser-repl--bol) (point)))))
+ (save-excursion (geiser-repl--bol) (point)))))
(save-restriction
(narrow-to-region begin (point-max))
(geiser-syntax--nesting-level))))
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 89f9abb..6674e32 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -125,7 +125,7 @@
(?\\ (cons 'char (geiser-syntax--read/elisp)))
(?\( (geiser-syntax--read/token 'vectorb))
(?\< (geiser-syntax--read/unprintable))
- ((?' ?` ?,) (char-before) (geiser-syntax--read/next-token))
+ ((?' ?` ?,) (backward-char) (geiser-syntax--read/next-token))
(t (let ((tok (geiser-syntax--read/elisp)))
(if tok (cons 'atom (intern (format "#%s" tok)))
(geiser-syntax--read/next-token))))))