diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-15 15:10:32 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-15 15:10:32 -0400 |
| commit | 35995769b516d228793940c5333ad522de992a6c (patch) | |
| tree | 366b81995e9afbf8f94ecf7d4237b325ec07a0a1 /emacs/guix-init.el.in | |
| parent | c6f909809aecb225b66dc27e4afd3ff46ec31a38 (diff) | |
| parent | e03f6d5e956b348c142d0ffd9f89af845f05eb86 (diff) | |
Merge branch 'master' into core-updates
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) |