nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fixes a regression introduced in 7741139080.

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.
This commit is contained in:
Alex Kost 2015-10-15 23:41:27 +03:00
parent 4af7c83bc7
commit b1b53df382
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emacs/guix-init.el
View File

@ -1,4 +1,5 @@
(require 'guix-autoloads) (require 'guix-autoloads)
(require 'guix-emacs)
(defcustom guix-package-enable-at-startup t (defcustom guix-package-enable-at-startup t
"If non-nil, activate Emacs packages installed in a user profile. "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 :type 'boolean
:group 'guix) :group 'guix)
(add-to-list 'load-path (guix-emacs-directory))
(when guix-package-enable-at-startup (when guix-package-enable-at-startup
(require 'guix-emacs)
(guix-emacs-load-autoloads 'all)) (guix-emacs-load-autoloads 'all))
(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe) (add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)