From 5800d2aae2490f4192823323b72d17f2645aeb9e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 10 Oct 2020 00:33:32 -0400 Subject: maint: update-guix-package: Prevent accidentally breaking guix pull. Fixes . This changes the 'update-guix-package' tool so that it: 1. Always uses a clean checkout to compute the hash of the updated 'guix' package. 2. Ensures the commit used in the updated 'guix' package definition has already been pushed upstream. * build-aux/update-guix-package.scm (%savannah-guix-git-repo-push-url): New variable. (with-input-pipe-to-string, with-temporary-git-worktree): New syntaxes. (find-origin-remote, git-add-worktree): New procedures. (commit-already-pushed?): New predicate. (main): Check the commit used has already been pushed upstream and compute the hash from a clean checkout. * doc/contributing.texi (Updating the Guix Package): Document it. * .dir-locals.el (scheme-mode): Fix indentation of with-temporary-git-worktree. --- .dir-locals.el | 1 + 1 file changed, 1 insertion(+) (limited to '.dir-locals.el') diff --git a/.dir-locals.el b/.dir-locals.el index 7f310d2612..19f15b3e1a 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -103,6 +103,7 @@ (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1)) (eval . (put 'with-repository 'scheme-indent-function 2)) (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2)) + (eval . (put 'with-temporary-git-worktree 'scheme-indent-function 2)) (eval . (put 'with-environment-variables 'scheme-indent-function 1)) (eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1)) -- cgit 1.4.1 From 0e1b0958bde5ccc34a4fed9a09cf949d5f9c9519 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 25 Oct 2020 14:10:15 -0400 Subject: .dir-locals.el: Automatically set the GEISER-GUILE-LOAD-PATH variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Miguel Ángel Arruga Vivas and Pierre Neidhardt for their suggestions and improvements. * .dir-locals.el: Set the GUIX-DIRECTORY and GEISER-GUILE-LOAD-PATH Emacs variables based on the location of the .dir-locals file. --- .dir-locals.el | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to '.dir-locals.el') diff --git a/.dir-locals.el b/.dir-locals.el index 19f15b3e1a..0496e41ca2 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -8,7 +8,26 @@ ;; For use with 'bug-reference-prog-mode'. (bug-reference-url-format . "http://bugs.gnu.org/%s") (bug-reference-bug-regexp - . ""))) + . "") + + ;; Emacs-Guix + (eval . (setq guix-directory + (locate-dominating-file default-directory ".dir-locals.el"))) + + ;; 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 (expand-file-name + (locate-dominating-file + default-directory ".dir-locals.el"))) + ;; 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) + (cl-pushnew root-dir* geiser-guile-load-path + :test #'string-equal))))) + (c-mode . ((c-file-style . "gnu"))) (scheme-mode . -- cgit 1.4.1 From 96d0f0b13819a68480e204716c1af6605cfdcb4c Mon Sep 17 00:00:00 2001 From: Miguel Ángel Arruga Vivas Date: Sun, 1 Nov 2020 01:57:02 +0100 Subject: .dir-locals.el: Require cl-lib at runtime. * .dir-locals.el (nil): Load cl-lib when needed. --- .dir-locals.el | 1 + 1 file changed, 1 insertion(+) (limited to '.dir-locals.el') diff --git a/.dir-locals.el b/.dir-locals.el index 0496e41ca2..8e5d3902e3 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -25,6 +25,7 @@ (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))))) -- cgit 1.4.1