diff options
| author | Alex Kost <alezost@gmail.com> | 2015-06-19 12:31:59 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2015-07-11 18:21:35 +0300 |
| commit | 7741139080a6b00aa4f1846fe7668859e91bec58 (patch) | |
| tree | f078f0dac3b6663ce37e690db69f928b903b0fbc /emacs/guix-init.el.in | |
| parent | d43002f64599fb80294d4c00e3a682a2776c885c (diff) | |
| download | guix-7741139080a6b00aa4f1846fe7668859e91bec58.tar guix-7741139080a6b00aa4f1846fe7668859e91bec58.tar.gz | |
emacs: Find autoloads in "guix.d" subdirectories.
Co-authored-by: Federico Beffa <beffa@fbengineering.ch>.
* emacs/guix-emacs.el (guix-emacs-find-autoloads-in-directory,
guix-emacs-subdirs): New functions.
(guix-emacs-find-autoloads): Search for autoloads in "guix.d"
subdirectories.
(guix-emacs-load-autoloads): Add subdirectories to 'load-path'.
* emacs/guix-init.el.in: Do not add guix emacs directory to 'load-path'
because it will be done by 'guix-emacs-load-autoloads'. Move
requiring 'guix-emacs' from the top-level to a clause for checking for
'guix-package-enable-at-startup'.
Diffstat (limited to 'emacs/guix-init.el.in')
| -rw-r--r-- | emacs/guix-init.el.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/emacs/guix-init.el.in b/emacs/guix-init.el.in index 4e40d7171a..728bc375c2 100644 --- a/emacs/guix-init.el.in +++ b/emacs/guix-init.el.in @@ -1,5 +1,4 @@ (require 'guix-autoloads) -(require 'guix-emacs) (defvar guix-load-path (replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@") @@ -13,9 +12,8 @@ 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)) (provide 'guix-init) |