Merge branch 'master' into emacs-team

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