summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-02-05 13:11:50 +0300
committerAlex Kost <alezost@gmail.com>2016-02-07 11:24:35 +0300
commit004ea62955a92f69efeaa90debde4e626acb6143 (patch)
tree69afe386b7eda44b54b177ac91c1d0a3835391ba /emacs
parent09b634565d6102a2d87302bcf83a290fb6fe862a (diff)
downloadpatches-004ea62955a92f69efeaa90debde4e626acb6143.tar
patches-004ea62955a92f69efeaa90debde4e626acb6143.tar.gz
emacs: Find Emacs packages in a system profile.
Fixes <http://bugs.gnu.org/22550>. Reported by myglc2 <myglc2@gmail.com>. * emacs/guix-emacs.el (guix-emacs-autoload-packages): Autoload Emacs packages installed in a system profile.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-emacs.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/emacs/guix-emacs.el b/emacs/guix-emacs.el
index be1e17053a..099261a013 100644
--- a/emacs/guix-emacs.el
+++ b/emacs/guix-emacs.el
@@ -86,7 +86,8 @@ Return nil, if Emacs packages are not installed in PROFILE."
;;;###autoload
(defun guix-emacs-autoload-packages (&rest profiles)
"Autoload Emacs packages installed in PROFILES.
-If PROFILES are not specified, use `guix-user-profile'.
+If PROFILES are not specified, use a default user and system
+profiles.
'Autoload' means add directories with Emacs packages to
`load-path' and load 'autoloads' files matching
@@ -95,7 +96,8 @@ If PROFILES are not specified, use `guix-user-profile'.
(funcall 'guix-profile-prompt)
guix-user-profile)))
(let ((profiles (or profiles
- (list guix-user-profile))))
+ (list "/run/current-system/profile"
+ guix-user-profile))))
(dolist (profile profiles)
(let ((dirs (guix-emacs-directories profile)))
(when dirs