summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2020-02-13 03:17:08 +0000
committerJose Antonio Ortega Ruiz <jao@gnu.org>2020-02-13 03:55:07 +0000
commitf23e0751bd9b2e4249af9ed76cce3f9e1e420979 (patch)
tree878143d955c0054c24fb08f71d0cb6a2610399ab
parentef3fb349700b60c5c697e8be10211360ebf88e07 (diff)
downloadgeiser-guile-f23e0751bd9b2e4249af9ed76cce3f9e1e420979.tar.gz
geiser-guile-f23e0751bd9b2e4249af9ed76cce3f9e1e420979.tar.bz2
Guile: use load paths defined in dir-local variables (fixes #268)
A similar idea should probably be used with other schemes, but right now i feel ashamed of having taken so long to fix this one (assuming it's fixed!), so let's rush this commit for a change.
-rw-r--r--elisp/geiser-guile.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index 198fde2..44d32e4 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -1,6 +1,6 @@
;; geiser-guile.el -- guile's implementation of the geiser protocols
-;; Copyright (C) 2009-2018 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009-2018, 2020 Jose Antonio Ortega Ruiz
;; Copyright (C) 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;; This program is free software; you can redistribute it and/or
@@ -370,10 +370,13 @@ it spawn a server thread."
(compilation-setup t)
(font-lock-add-keywords nil `((,geiser-guile--path-rx
1 compilation-error-face)))
- (let ((geiser-log-verbose-p t))
+ (let ((geiser-log-verbose-p t)
+ (g-load-path (buffer-local-value 'geiser-guile-load-path
+ (or geiser-repl--last-scm-buffer
+ (current-buffer)))))
(when remote (geiser-guile--set-geiser-load-path))
(geiser-eval--send/wait ",use (geiser emacs)\n'done")
- (dolist (dir geiser-guile-load-path)
+ (dolist (dir g-load-path)
(let ((dir (expand-file-name dir)))
(geiser-eval--send/wait `(:eval (:ge add-to-load-path ,dir)))))
(geiser-guile-update-warning-level)))