From 9a479bc383b8de26a1660923de4e73019ba795c2 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@openmailbox.org>
Date: Mon, 27 Jul 2015 23:20:09 +0200
Subject: [PATCH] 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 insertion(+), 7 deletions(-)

diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el
index 3fafae4c2498553205c78f869ab5eadbcc95e285..7db1daacf07e3f7b603c2c334bf8714137b7d967 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 6ea6fcd0b03ee88757d076497c45bb6d0e3b1d45..3a727c7eb6f977e8b98fa86535f9e1927cb9f82b 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