branch master updated: .dir-locals.el: Allow Guix root-dir overrides when working via Tramp.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new cedf97ed6e .dir-locals.el: Allow Guix root-dir overrides when working 
via Tramp.
cedf97ed6e is described below

commit cedf97ed6ee4eba8c39bfe6cc0efe33fcb977ccf
Author: Brian Cully <bjc@kublai.com>
AuthorDate: Sat May 21 15:10:24 2022 -0400

    .dir-locals.el: Allow Guix root-dir overrides when working via Tramp.
    
    * .dir-localsl.el: Add only the local part of the root directory to the
    guile search path. This lets you use Tramp to hack on a remote Guix
    checkout.
    
    Signed-off-by: Leo Famulari <leo@famulari.name>
---
 .dir-locals.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index b8b0fec4ca..8635b29565 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -43,7 +43,7 @@
                ;; 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 (expand-file-name 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)))