[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: emacs: Use only one guix-load-path variable.
From: |
Mathieu Lirzin |
Subject: |
03/03: emacs: Use only one guix-load-path variable. |
Date: |
Sun, 30 Aug 2015 20:49:15 +0000 |
mthl pushed a commit to branch master
in repository guix.
commit 9a479bc383b8de26a1660923de4e73019ba795c2
Author: Mathieu Lirzin <address@hidden>
Date: Mon Jul 27 23:20:09 2015 +0200
emacs: Use only one guix-load-path variable.
emacs/guix-init.el (guix-load-path): Move to ...
emacs/guix-backend.el (guix-load-path): ... Here. Redefine it.
---
emacs/guix-backend.el | 4 +---
emacs/guix-init.el | 4 ----
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 3fafae4..7db1daa 100644
--- a/emacs/guix-backend.el
+++ b/emacs/guix-backend.el
@@ -55,9 +55,7 @@
(require 'guix-config)
(require 'guix-emacs)
-(defvar guix-load-path
- (file-name-directory (or load-file-name
- (locate-library "guix")))
+(defvar guix-load-path guix-emacs-interface-directory
"Directory with scheme files for \"guix.el\" package.")
(defvar guix-helper-file
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 6ea6fcd..3a727c7 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -1,9 +1,5 @@
-(require 'guix-config)
(require 'guix-autoloads)
-(defvar guix-load-path guix-emacs-interface-directory
- "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