[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/4] emacs: Use only one guix-load-path variable.
From: |
Mathieu Lirzin |
Subject: |
[PATCH 4/4] emacs: Use only one guix-load-path variable. |
Date: |
Mon, 27 Jul 2015 23:48:40 +0200 |
emacs/guix-init.el (guix-load-path): Move to ...
emacs/guix-config.el.in (guix-load-path): ... Here.
emacs/guix-backend.el (guix-load-path): Remove it. Use the one from
'guix-config'.
---
emacs/guix-backend.el | 5 -----
emacs/guix-config.el.in | 4 ++++
emacs/guix-init.el | 4 ----
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 3fafae4..457dd44 100644
--- a/emacs/guix-backend.el
+++ b/emacs/guix-backend.el
@@ -55,11 +55,6 @@
(require 'guix-config)
(require 'guix-emacs)
-(defvar guix-load-path
- (file-name-directory (or load-file-name
- (locate-library "guix")))
- "Directory with scheme files for \"guix.el\" package.")
-
(defvar guix-helper-file
(expand-file-name "guix-helper.scm" guix-load-path)
"Auxiliary scheme file for loading.")
diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in
index ed2e846..6ac6051 100644
--- a/emacs/guix-config.el.in
+++ b/emacs/guix-config.el.in
@@ -37,6 +37,10 @@ Where ARGS is a list of arguments to the guile program.")
(defconst guix-local-state-dir
"@guix_localstatedir@"oo)
+(defvar guix-load-path
+ (replace-regexp-in-string "${prefix}" guix-prefix guix-emacs-ui-dir)
+ "Directory with scheme files for \"guix.el\" package.")
+
(provide 'guix-config)
;;; guix-config.el ends here
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 353bb27..ff147f9 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -1,10 +1,6 @@
(require 'guix-config)
(require 'guix-autoloads)
-(defvar guix-load-path
- (replace-regexp-in-string "${prefix}" guix-prefix guix-emacs-ui-dir)
- "Directory with scheme files for \"guix.el\" package.")
-
(defcustom guix-package-enable-at-startup t
"If non-nil, activate Emacs packages installed in a user profile.
Set this variable to nil before requiring `guix-init' file to