From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH 4/4] emacs: Use only one guix-load-path variable. Date: Mon, 27 Jul 2015 23:48:40 +0200 Message-ID: <1438033720-30958-5-git-send-email-mthl@openmailbox.org> References: <1438033720-30958-1-git-send-email-mthl@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.4.3" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJqJF-0007up-1B for guix-devel@gnu.org; Mon, 27 Jul 2015 17:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJqJB-0006FF-Q3 for guix-devel@gnu.org; Mon, 27 Jul 2015 17:51:44 -0400 Received: from smtp21.openmailbox.org ([62.4.1.55]:40114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJqJB-0006Em-Jy for guix-devel@gnu.org; Mon, 27 Jul 2015 17:51:41 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.openmailbox.org (Postfix) with ESMTP id CDD612E048F for ; Mon, 27 Jul 2015 23:51:40 +0200 (CEST) In-Reply-To: <1438033720-30958-1-git-send-email-mthl@openmailbox.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.4.3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable 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(-) --------------2.4.3 Content-Type: text/x-patch; name="0004-emacs-Use-only-one-guix-load-path-variable.patch" Content-Disposition: inline; filename="0004-emacs-Use-only-one-guix-load-path-variable.patch" Content-Transfer-Encoding: quoted-printable 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) =20 -(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) =20 +(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) =20 ;;; 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) =20 -(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 --------------2.4.3--