~ruther/guix-local

b1b53df382deaeb849241f44581421704245483d — Alex Kost 10 years ago 4af7c83
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.
1 files changed, 3 insertions(+), 1 deletions(-)

M emacs/guix-init.el
M emacs/guix-init.el => emacs/guix-init.el +3 -1
@@ 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)