summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-26 12:00:12 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-02-26 12:00:12 +0100
commit9ff1f7e76b989d2dafea92457619d8227e4ddc5f (patch)
treeb7b032f8cfa4b75f7a5d1e37144cb33c60b66687
parent4608da2ac8d4bafa7b8acbd7a097e32e5eb2f764 (diff)
downloadgeiser-guile-9ff1f7e76b989d2dafea92457619d8227e4ddc5f.tar.gz
geiser-guile-9ff1f7e76b989d2dafea92457619d8227e4ddc5f.tar.bz2
Eval/load file in the correct module.
-rw-r--r--geiser/emacs.scm16
1 files changed, 2 insertions, 14 deletions
diff --git a/geiser/emacs.scm b/geiser/emacs.scm
index 90e03dd..f440827 100644
--- a/geiser/emacs.scm
+++ b/geiser/emacs.scm
@@ -125,32 +125,20 @@
(compile form))))
(define (ge:eval form module-name)
- "Evals @var{form} in the module designated by @var{module-name}.
-If @var{module-name} is @var{#f} or resolution fails, the current module is used instead.
-The result is a list of the form ((RESULT . <form-value>) (OUTPUT . <string>))
-if no evaluation error happens, or ((ERROR (KEY . <error-key>) <error-arg>...))
-in case of errors. Each error arg is a cons (NAME . VALUE), where NAME includes
-SUBR, MSG and REST."
(evaluate form module-name eval))
(define (ge:compile form module-name)
- "Compiles @var{form} in the module designated by @var{module-name}.
-If @var{module-name} is @var{#f} or resolution fails, the current module is used instead.
-The result is a list of the form ((RESULT . <form-value>) (OUTPUT . <string>))
-if no evaluation error happens, or ((ERROR (KEY . <error-key>) <error-arg>...))
-in case of errors. Each error arg is a cons (NAME . VALUE), where NAME includes
-SUBR, MSG and REST."
(evaluate form module-name eval-compile))
(define (ge:compile-file path)
"Compile and load file, given its full @var{path}."
(evaluate `(and (compile-file ,path)
(load-compiled ,(compiled-file-name path)))
- '(geiser emacs)
+ #f
eval))
(define (ge:load-file path)
"Load file, given its full @var{path}."
- (evaluate `(load ,path) '(geiser emacs) eval))
+ (evaluate `(load ,path) #f eval))
;;; emacs.scm ends here