summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2016-12-03 01:57:51 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2016-12-03 01:57:51 +0100
commit6893f692259c0241049bf614147160c44dd4ba3e (patch)
treeb63b4e0f423f5b9337def620702f90bb5f5a442e
parentae895088fab7593295dc16bc7d58a67321f92d46 (diff)
downloadgeiser-guile-6893f692259c0241049bf614147160c44dd4ba3e.tar.gz
geiser-guile-6893f692259c0241049bf614147160c44dd4ba3e.tar.bz2
Bug fix: expanding file name at the right time
We were expanding the path of files to be loaded at the wrong place in the wrong way. This should be better and address bug #196.
-rw-r--r--elisp/geiser-compile.el2
-rw-r--r--elisp/geiser-guile.el3
2 files changed, 2 insertions, 3 deletions
diff --git a/elisp/geiser-compile.el b/elisp/geiser-compile.el
index 26aad16..e22907f 100644
--- a/elisp/geiser-compile.el
+++ b/elisp/geiser-compile.el
@@ -59,7 +59,7 @@
(defun geiser-load-file (path)
"Load Scheme file."
(interactive "FScheme file: ")
- (geiser-compile--file-op path nil "Loading"))
+ (geiser-compile--file-op (expand-file-name path) nil "Loading"))
(defun geiser-load-current-buffer ()
"Load current Scheme file."
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index 0b71edf..dacca55 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -158,8 +158,7 @@ This function uses `geiser-guile-init-file' if it exists."
(or (car args) "#f")
(geiser-guile--linearize-args (cdr args))
(if (cddr args) "" " ()")))
- ((load-file compile-file)
- (format ",geiser-load-file %s" (expand-file-name (car args))))
+ ((load-file compile-file) (format ",geiser-load-file %s" (car args)))
((no-values) ",geiser-no-values")
(t (format "ge:%s (%s)" proc (geiser-guile--linearize-args args)))))