aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@openmailbox.org>2015-07-27 23:20:09 +0200
committerMathieu Lirzin <mthl@openmailbox.org>2015-08-30 22:46:21 +0200
commit9a479bc383b8de26a1660923de4e73019ba795c2 (patch)
tree1408c788b972ffa9c94dbc99382e8bc7e91132c2
parent7061938fdb7524555a8903af59992ae0645c0480 (diff)
downloadguix-9a479bc383b8de26a1660923de4e73019ba795c2.tar
guix-9a479bc383b8de26a1660923de4e73019ba795c2.tar.gz
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.
-rw-r--r--emacs/guix-backend.el4
-rw-r--r--emacs/guix-init.el4
2 files changed, 1 insertions, 7 deletions
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 3fafae4c24..7db1daacf0 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 6ea6fcd0b0..3a727c7eb6 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