diff options
| author | Alex Kost <alezost@gmail.com> | 2016-02-04 14:50:37 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2016-02-04 15:31:43 +0300 |
| commit | e20f051ec45719631bdc5ea4fad9ab1787bb0c18 (patch) | |
| tree | b21fe0f0e041d6e7940bb0e7a6f0461a81f94dbc | |
| parent | 17c20385fb4f620fe79a37f134f2c6f7d4205c27 (diff) | |
| download | patches-e20f051ec45719631bdc5ea4fad9ab1787bb0c18.tar patches-e20f051ec45719631bdc5ea4fad9ab1787bb0c18.tar.gz | |
emacs: Add missing (require 'guix-profiles).
Reported by Christopher Allan Webber <cwebber@dustycloud.org> on #guix.
Several modules use the code from 'guix-profiles' without requiring it. It
was never noticed before commits e4e2154644ecf76ea02a50304c1405c00c9ffdd1
and 13fe4891fa247d306e203ee14c6886513bd86b52, because 'guix-emacs' required
this module. But now, when 'site-start.el' loads 'guix-emacs',
'guix-profiles' may not exist yet, so it may not be required. This will
lead to an error when some of "M-x guix-..." commands will be used. See
<https://gnunet.org/bot/log/guix/2016-02-03#T898859>.
* emacs/guix-base.el: Require 'guix-profiles'.
* emacs/guix-ui.el: Likewise.
* emacs/guix-ui-generation.el: Likewise.
* emacs/guix-ui-package.el: Likewise.
| -rw-r--r-- | emacs/guix-base.el | 1 | ||||
| -rw-r--r-- | emacs/guix-ui-generation.el | 1 | ||||
| -rw-r--r-- | emacs/guix-ui-package.el | 1 | ||||
| -rw-r--r-- | emacs/guix-ui.el | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/emacs/guix-base.el b/emacs/guix-base.el index d720a87833..9f9f258451 100644 --- a/emacs/guix-base.el +++ b/emacs/guix-base.el @@ -30,6 +30,7 @@ (require 'guix-read) (require 'guix-utils) (require 'guix-ui) +(require 'guix-profiles) (defgroup guix nil "Settings for Guix package manager and friends." diff --git a/emacs/guix-ui-generation.el b/emacs/guix-ui-generation.el index 74b8ff2579..67cf6294fb 100644 --- a/emacs/guix-ui-generation.el +++ b/emacs/guix-ui-generation.el @@ -35,6 +35,7 @@ (require 'guix-guile) (require 'guix-entry) (require 'guix-utils) +(require 'guix-profiles) (guix-ui-define-entry-type generation) diff --git a/emacs/guix-ui-package.el b/emacs/guix-ui-package.el index 414bc9b9d2..0971fdd438 100644 --- a/emacs/guix-ui-package.el +++ b/emacs/guix-ui-package.el @@ -37,6 +37,7 @@ (require 'guix-hydra-build) (require 'guix-read) (require 'guix-license) +(require 'guix-profiles) (guix-ui-define-entry-type package) (guix-ui-define-entry-type output) diff --git a/emacs/guix-ui.el b/emacs/guix-ui.el index 7fef7c355c..9a88efc286 100644 --- a/emacs/guix-ui.el +++ b/emacs/guix-ui.el @@ -30,6 +30,7 @@ (require 'guix-guile) (require 'guix-utils) (require 'guix-messages) +(require 'guix-profiles) (guix-define-groups ui :group-doc "\ |