aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-emacs.el36
-rw-r--r--emacs/guix-init.el2
2 files changed, 21 insertions, 17 deletions
diff --git a/emacs/guix-emacs.el b/emacs/guix-emacs.el
index 0e3e8c211c..6515b3dc30 100644
--- a/emacs/guix-emacs.el
+++ b/emacs/guix-emacs.el
@@ -74,29 +74,33 @@ Return nil if there are no emacs packages installed in PROFILE."
nil)))
;;;###autoload
-(defun guix-emacs-load-autoloads (&optional all)
- "Load autoloads for Emacs packages installed in a user profile.
-Add autoloads directories to `load-path'.
-If ALL is nil, activate only those packages that were installed
-after the last activation, otherwise activate all Emacs packages
-installed in `guix-user-profile'."
- (interactive "P")
- (let* ((autoloads (guix-emacs-find-autoloads))
- (files (if all
- autoloads
- (cl-nset-difference autoloads guix-emacs-autoloads
- :test #'string=))))
- (dolist (file files)
- (cl-pushnew (file-name-directory file) load-path
+(defun guix-emacs-load-autoloads (&optional profile)
+ "Load autoloads for Emacs packages installed in PROFILE.
+If PROFILE is nil, use `guix-user-profile'.
+Add autoloads directories to `load-path'."
+ (interactive (list (guix-profile-prompt)))
+ (let* ((autoloads (guix-emacs-find-autoloads profile))
+ (new-autoloads (cl-nset-difference autoloads
+ guix-emacs-autoloads
+ :test #'string=)))
+ (dolist (file new-autoloads)
+ (cl-pushnew (directory-file-name (file-name-directory file))
+ load-path
:test #'string=)
(load file 'noerror))
- (setq guix-emacs-autoloads autoloads)))
+ (setq guix-emacs-autoloads
+ (append new-autoloads guix-emacs-autoloads))))
(defun guix-emacs-load-autoloads-maybe ()
"Load autoloads for Emacs packages if needed.
See `guix-emacs-activate-after-operation' for details."
(and guix-emacs-activate-after-operation
- (guix-emacs-load-autoloads)))
+ ;; FIXME Since a user can work with a non-current profile (using
+ ;; C-u before `guix-search-by-name' and other commands), emacs
+ ;; packages can be installed to another profile, and the
+ ;; following code will not work (i.e., the autoloads for this
+ ;; profile will not be loaded).
+ (guix-emacs-load-autoloads guix-current-profile)))
(provide 'guix-emacs)
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 1612dee83f..1da607034f 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -12,7 +12,7 @@ avoid loading autoloads of Emacs packages installed in
(add-to-list 'load-path (guix-emacs-directory))
(when guix-package-enable-at-startup
- (guix-emacs-load-autoloads 'all))
+ (guix-emacs-load-autoloads))
(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
(add-hook 'shell-mode-hook 'guix-build-log-minor-mode-activate-maybe)