diff options
| author | Alex Kost <alezost@gmail.com> | 2015-10-15 23:41:27 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2015-10-16 17:14:57 +0300 |
| commit | b1b53df382deaeb849241f44581421704245483d (patch) | |
| tree | d0f0f9d40519533af4ae9b73d3ceb0566136af12 /emacs/guix-init.el | |
| parent | 4af7c83bc7010b23735c40e074c7d581dad8212e (diff) | |
| download | guix-b1b53df382deaeb849241f44581421704245483d.tar guix-b1b53df382deaeb849241f44581421704245483d.tar.gz | |
emacs: init: Add "share/emacs/site-lisp" to 'load-path'.
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.
Diffstat (limited to 'emacs/guix-init.el')
| -rw-r--r-- | emacs/guix-init.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/emacs/guix-init.el b/emacs/guix-init.el index 96aa0c2ffc..4b3d9c281c 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) |