guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Mathieu Lirzin
Subject: [PATCH 3/4] emacs: Move guix-guile-program to 'guix-config'.
Date: Mon, 27 Jul 2015 23:48:39 +0200

* emacs/guix-backend.el (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.")
-
 
 ;;; REPL
 
diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in
index 542de15..ed2e846 100644
--- a/emacs/guix-config.el.in
+++ b/emacs/guix-config.el.in
@@ -19,6 +19,15 @@
 
 ;;; Code:
 
+(defconst 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.")
+
 (defconst guix-prefix
   "@prefix@")
 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]