diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-06 13:57:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-06 14:16:22 -0400 |
| commit | 65dcfb3f3865d08467da747041263fd22460d393 (patch) | |
| tree | 99330152af254a9c5542c563c9fd29efb408fde3 /.dir-locals.el | |
| parent | 28b22c45ee2369ada8ef8da595cda0dd32bf3512 (diff) | |
| download | guix-65dcfb3f3865d08467da747041263fd22460d393.tar guix-65dcfb3f3865d08467da747041263fd22460d393.tar.gz | |
.dir-locals: Streamline Geiser configuration.
Geiser now has support locating the project root and adding it to the load
path without external help; leverage it.
* .dir-locals.el [nil]: Remove obsolete Geiser configuration. Set the
geiser-repl-per-project-p variable to t.
* doc/contributing.texi (The Perfect Setup): No longer mention explicitly
setting the geiser-guile-load-path; instead mention the effect of the
.dir-locals.el file.
Reported-by: Wolf <wolf@wolfsden.cz>
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index d79b5c9d7e..36714c1aa4 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -32,27 +32,7 @@ ;; Geiser ;; This allows automatically setting the `geiser-guile-load-path' ;; variable when using various Guix checkouts (e.g., via git worktrees). - (eval . (let ((root-dir-unexpanded (locate-dominating-file - default-directory ".dir-locals.el"))) - ;; While Guix should in theory always have a .dir-locals.el - ;; (we are reading this file, after all) there seems to be a - ;; strange problem where this code "escapes" to some other buffers, - ;; at least vc-mode. See: - ;; https://lists.gnu.org/archive/html/guix-devel/2020-11/msg00296.html - ;; Upstream report: <https://bugs.gnu.org/44698> - ;; Hence the following "when", which might otherwise be unnecessary; - ;; it prevents causing an error when root-dir-unexpanded is nil. - (when root-dir-unexpanded - (let* ((root-dir (file-local-name (expand-file-name root-dir-unexpanded))) - ;; Workaround for bug https://issues.guix.gnu.org/43818. - (root-dir* (directory-file-name root-dir))) - - (unless (boundp 'geiser-guile-load-path) - (defvar geiser-guile-load-path '())) - (make-local-variable 'geiser-guile-load-path) - (require 'cl-lib) - (cl-pushnew root-dir* geiser-guile-load-path - :test #'string-equal))))))) + (geiser-repl-per-project-p . t))) (c-mode . ((c-file-style . "gnu"))) (scheme-mode |