Re: [PATCH 3/4] emacs: Move guix-guile-program to 'guix-config'.

[Mathieu Lirzin <mthl@openmailbox.org>]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

Alex Kost <alezost@gmail.com> writes:

> I would rather add 'guix-guile-program' after both 'guix-…-directory'
> constants, but it doesn't really matter.

I'm OK with that. Here is the updated patch.

--
Mathieu Lirzin


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-emacs-Fix-guix-guile-program-default-value.patch --]
[-- Type: text/x-diff, Size: 1905 bytes --]

From 65f22b2dfc5c7e3b799399f5d10a1afba5416f3b Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@openmailbox.org>
Date: Mon, 27 Jul 2015 22:55:28 +0200
Subject: [PATCH 2/3] emacs: Fix guix-guile-program default value.

* emacs/guix-backend.el: Use guix-config.
  (guix-guile-program): Move to ...
* emacs/guix-config.el.in (guix-guile-program): ... here.  Use Guile
  program file name from compile-time instead of depending on
  PATH.  (Bug#21127)
---
 emacs/guix-backend.el   | 10 +---------
 emacs/guix-config.el.in |  9 +++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 73a429b..3fafae4 100644
--- a/emacs/guix-backend.el
+++ b/emacs/guix-backend.el
@@ -52,6 +52,7 @@
 ;;; Code:
 
 (require 'geiser-mode)
+(require 'guix-config)
 (require 'guix-emacs)
 
 (defvar guix-load-path
@@ -63,15 +64,6 @@
   (expand-file-name "guix-helper.scm" guix-load-path)
   "Auxiliary scheme file for loading.")
 
-(defvar guix-guile-program (or geiser-guile-binary "guile")
-  "Name of the guile executable used for Guix REPL.
-May be either a string (the name of the executable) or a list of
-strings of the form:
-
-  (NAME . ARGS)
-
-Where ARGS is a list of arguments to the guile program.")
-
 \f
 ;;; REPL
 
diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in
index 8804f72..16434ce 100644
--- a/emacs/guix-config.el.in
+++ b/emacs/guix-config.el.in
@@ -26,6 +26,15 @@
   ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
   (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix"))
 
+(defvar guix-guile-program "@GUILE@"
+  "Name of the guile executable used for Guix REPL.
+May be either a string (the name of the executable) or a list of
+strings of the form:
+
+  (NAME . ARGS)
+
+Where ARGS is a list of arguments to the guile program.")
+
 (provide 'guix-config)
 
 ;;; guix-config.el ends here
-- 
2.1.4