From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH] emacs: init: Add "share/emacs/site-lisp" to 'load-path'. Date: Fri, 16 Oct 2015 00:15:33 +0300 Message-ID: <8737xbkf4a.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmpsL-00089R-3B for guix-devel@gnu.org; Thu, 15 Oct 2015 17:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmpsH-0006K7-FT for guix-devel@gnu.org; Thu, 15 Oct 2015 17:15:48 -0400 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 --=-=-= Content-Type: text/plain As discussed on IRC, add site-lisp dir to load-path. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-emacs-init-Add-share-emacs-site-lisp-to-load-path.patch Content-Transfer-Encoding: quoted-printable >From 5e03db3f31086b3cad95fc56f4f1b7da8a2f4912 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 15 Oct 2015 23:41:27 +0300 Subject: [PATCH] emacs: init: Add "share/emacs/site-lisp" to 'load-path'. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Fixes a regression introduced in 7741139080a6b00aa4f1846fe7668859e91bec58. Reported by Ludovic Court=C3=A8s . Not all emacs packages have "...-autoloads.el" files, so there is a chance that "~/.guix-profile/share/emacs/site-lisp" will not be added to 'load-path', so add it unconditionally. * emacs/guix-init.el: Add guix emacs directory to 'load-path'. Move requiring 'guix-emacs' to the top-level. --- emacs/guix-init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emacs/guix-init.el b/emacs/guix-init.el index 96aa0c2..4b3d9c2 100644 --- a/emacs/guix-init.el +++ b/emacs/guix-init.el @@ -1,4 +1,5 @@ (require 'guix-autoloads) +(require 'guix-emacs) =20 (defcustom guix-package-enable-at-startup t "If non-nil, activate Emacs packages installed in a user profile. @@ -8,8 +9,9 @@ avoid loading autoloads of Emacs packages installed in :type 'boolean :group 'guix) =20 +(add-to-list 'load-path (guix-emacs-directory)) + (when guix-package-enable-at-startup - (require 'guix-emacs) (guix-emacs-load-autoloads 'all)) =20 (add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe) --=20 2.5.0 --=-=-=--