summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-05-20 22:40:36 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-05-20 22:40:36 +0200
commit5f3993bffb01dafb2f7a943ece88753143ccdb04 (patch)
treeeb8f1585b02b7390e28d1494eb4a1205adc74586
parent36ad012fd1c5c0a1b1fff02bf3123080901b796e (diff)
downloadgeiser-5f3993bffb01dafb2f7a943ece88753143ccdb04.tar.gz
geiser-5f3993bffb01dafb2f7a943ece88753143ccdb04.tar.bz2
Fixes for module names reading and evaluation result display.
-rw-r--r--elisp/geiser-completion.el13
-rw-r--r--elisp/geiser-debug.el2
-rw-r--r--elisp/geiser-edit.el2
3 files changed, 8 insertions, 9 deletions
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index f8449a6..dadf6dd 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -184,13 +184,12 @@ terminates a current completion."
(defun geiser-completion--read-module (&optional prompt default history)
(let ((minibuffer-local-completion-map geiser-completion--module-minibuffer-map))
- (geiser-eval--get-module
- (completing-read (or prompt "Module name: ")
- geiser-completion--module-list-func
- nil nil nil
- (or history geiser-completion--module-history)
- (or default
- (format "%s" (or (geiser-syntax--buffer-module) "")))))))
+ (completing-read (or prompt "Module name: ")
+ geiser-completion--module-list-func
+ nil nil nil
+ (or history geiser-completion--module-history)
+ (or default
+ (format "%s" (or (geiser-syntax--buffer-module) ""))))))
(defun geiser--respecting-message (format &rest format-args)
"Display TEXT as a message, without hiding any minibuffer contents."
diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el
index 0573716..bc155c9 100644
--- a/elisp/geiser-debug.el
+++ b/elisp/geiser-debug.el
@@ -62,7 +62,7 @@
(when output (insert output "\n\n"))
(when stack (geiser-debug--display-stack stack))
(goto-char (point-min)))
- (when (or err output) (geiser-debug--pop-to-buffer))))
+ (when err (geiser-debug--pop-to-buffer))))
(defsubst geiser-debug--frame-proc (frame) (cdr (assoc 'procedure frame)))
(defsubst geiser-debug--frame-desc (frame) (cdr (assoc 'description frame)))
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index c02e7bb..986099e 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -145,7 +145,7 @@ With prefix, asks for the symbol to edit."
(defun geiser-edit-module (module)
"Asks for a module and opens it in a new buffer."
(interactive (list (geiser-completion--read-module)))
- (let ((cmd `(:eval ((:ge module-location) ,module))))
+ (let ((cmd `(:eval ((:ge module-location) (:module ,module)))))
(geiser-edit--try-edit module (geiser-eval--send/wait cmd))))