From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH] emacs: 'guix-emacs-load-autoloads' takes a profile.
Date: Thu, 03 Dec 2015 13:32:22 +0300 [thread overview]
Message-ID: <87wpsvhlft.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
Since a user may have several profiles, (s)he may want to load
"…-autoloads.el" files from other profiles. So this patch provides this
possibility, i.e. if a user keeps his/her emacs packages in a separate
profile, (s)he can do something like this:
(setq guix-package-enable-at-startup nil)
(require 'guix-init nil t)
(guix-emacs-load-autoloads "/path/to/my/profile-with-emacs-packages")
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-emacs-guix-emacs-load-autoloads-takes-a-profile.patch --]
[-- Type: text/x-patch, Size: 3115 bytes --]
From 1147b16c79cb176db8f26aa88b9e930a9dea2268 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Fri, 27 Nov 2015 16:07:20 +0300
Subject: [PATCH] emacs: 'guix-emacs-load-autoloads' takes a profile.
* emacs/guix-emacs.el (guix-emacs-load-autoloads): Use 'profile'
as an optional argument.
(guix-emacs-load-autoloads-maybe): Adjust accordingly.
* emacs/guix-init.el: Likewise.
---
emacs/guix-emacs.el | 31 +++++++++++++++----------------
emacs/guix-init.el | 2 +-
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/emacs/guix-emacs.el b/emacs/guix-emacs.el
index 0e3e8c2..04f38cb 100644
--- a/emacs/guix-emacs.el
+++ b/emacs/guix-emacs.el
@@ -74,29 +74,28 @@ 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)))
+ (guix-emacs-load-autoloads guix-current-profile)))
(provide 'guix-emacs)
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 1612dee..1da6070 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)
--
2.6.3
next reply other threads:[~2015-12-03 10:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 10:32 Alex Kost [this message]
2015-12-04 14:50 ` [PATCH] emacs: 'guix-emacs-load-autoloads' takes a profile Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wpsvhlft.fsf@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.