[PATCH] emacs: init: Add "share/emacs/site-lisp" to 'load-path'.

[PATCH] emacs: init: Add "share/emacs/site-lisp" to 'load-path'.

[Alex Kost]

[-- Attachment #1: Type: text/plain, Size: 54 bytes --]

As discussed on IRC, add site-lisp dir to load-path.


[-- Attachment #2: 0001-emacs-init-Add-share-emacs-site-lisp-to-load-path.patch --]
[-- Type: text/x-patch, Size: 1503 bytes --]

From 5e03db3f31086b3cad95fc56f4f1b7da8a2f4912 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
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=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a regression introduced in 7741139080a6b00aa4f1846fe7668859e91bec58.

Reported by Ludovic Courtès <ludo@gnu.org>.

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)
 
 (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)
 
+(add-to-list 'load-path (guix-emacs-directory))
+
 (when guix-package-enable-at-startup
-  (require 'guix-emacs)
   (guix-emacs-load-autoloads 'all))
 
 (add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
-- 
2.5.0

Re: [PATCH] emacs: init: Add "share/emacs/site-lisp" to 'load-path'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> From 5e03db3f31086b3cad95fc56f4f1b7da8a2f4912 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> 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=UTF-8
> Content-Transfer-Encoding: 8bit
>
> Fixes a regression introduced in 7741139080a6b00aa4f1846fe7668859e91bec58.
>
> Reported by Ludovic Courtès <ludo@gnu.org>.
>
> 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.

LGTM.  Thanks for investigating the issue!

Ludo’.

Re: [PATCH] emacs: init: Add "share/emacs/site-lisp" to 'load-path'.

[Alex Kost]

Ludovic Courtès (2015-10-16 11:34 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> From 5e03db3f31086b3cad95fc56f4f1b7da8a2f4912 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> 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=UTF-8
>> Content-Transfer-Encoding: 8bit
>>
>> Fixes a regression introduced in 7741139080a6b00aa4f1846fe7668859e91bec58.
>>
>> Reported by Ludovic Courtès <ludo@gnu.org>.
>>
>> 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.
>
> LGTM.  Thanks for investigating the issue!

Thanks for reporting!  Pushed.

-- 
Alex