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
commit85e02446e1c721049d789c4d2f86d6bf96f46c26 (patch)
treec4298bf2e9fbf677c5de5b3ade1e3a93a40a55e0
parenta628778c084178653570ea423d530324fb0ce07c (diff)
downloadgeiser-chez-85e02446e1c721049d789c4d2f86d6bf96f46c26.tar.gz
geiser-chez-85e02446e1c721049d789c4d2f86d6bf96f46c26.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
-rw-r--r--elisp/geiser-guile.el5
4 files changed, 8 insertions, 14 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))))
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index f4362ca..e6e0c9a 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -85,9 +85,6 @@ This function uses `geiser-guile-init-file' if it exists."
;;; Evaluation support:
(defun geiser-guile-geiser-procedure (proc)
- "Translate a bare procedure symbol to one executable in Guile's
-context. Return NULL for unsupported ones; at the very least,
-EVAL, COMPILE, LOAD-FILE and COMPILE-FILE should be supported."
(let ((proc (intern (format "ge:%s"
(if (and geiser-guile-use-compiler-in-eval
(eq proc 'eval))
@@ -99,8 +96,6 @@ EVAL, COMPILE, LOAD-FILE and COMPILE-FILE should be supported."
"(define-module +\\(([^)]+)\\)")
(defun geiser-guile-get-module (&optional module)
- "Return a scheme datum representing the current module.
-If MODULE is provided, transform it to such a datum."
(cond ((null module)
(save-excursion
(goto-char (point-min))