diff options
| author | Alex Kost <alezost@gmail.com> | 2014-09-28 09:32:41 +0400 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2014-09-28 22:46:15 +0400 |
| commit | 3472bb20c5521f9dc85404a4dab9abef11c87a22 (patch) | |
| tree | f8f69b5333a9a3bc67b4de8c149c4f1e4713bb77 /emacs/guix-list.el | |
| parent | 2e269860c48696ca6fd0a76315a85ca3fd1ee3bc (diff) | |
| download | patches-3472bb20c5521f9dc85404a4dab9abef11c87a22.tar patches-3472bb20c5521f9dc85404a4dab9abef11c87a22.tar.gz | |
emacs: Use package/output type variables where needed.
* emacs/guix-list.el (guix-package-list-type, guix-output-list-describe-type):
Move to...
* emacs/guix-base.el: ... here. Rename 'guix-output-list-describe-type' to
'guix-package-info-type'.
* emacs/guix-info.el (guix-generation-info-insert-number): Use
'guix-package-list-type'.
* emacs/guix.el (guix-get-show-packages): Use 'guix-package-info-type'.
Diffstat (limited to 'emacs/guix-list.el')
| -rw-r--r-- | emacs/guix-list.el | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/emacs/guix-list.el b/emacs/guix-list.el index 3342175fe3..6a4cdfc552 100644 --- a/emacs/guix-list.el +++ b/emacs/guix-list.el @@ -469,15 +469,6 @@ With prefix (if ARG is non-nil), describe entries marked with any mark." "Face used if a package is obsolete." :group 'guix-package-list) -(defcustom guix-package-list-type 'output - "Define how to display packages in a list buffer. -May be a symbol `package' or `output' (if `output', display each -output on a separate line; if `package', display each package on -a separate line)." - :type '(choice (const :tag "List of packages" package) - (const :tag "List of outputs" output)) - :group 'guix-package-list) - (defcustom guix-package-list-generation-marking-enabled nil "If non-nil, allow putting marks in a list with 'generation packages'. @@ -648,15 +639,6 @@ The specification is suitable for `guix-process-package-actions'." (upgrade . ?U) (delete . ?D))) -(defcustom guix-output-list-describe-type 'package - "Define how to describe outputs in a list buffer. -May be a symbol `package' or `output' (if `output', describe only -marked outputs; if `package', describe all outputs of the marked -packages)." - :type '(choice (const :tag "Describe packages" package) - (const :tag "Describe outputs" output)) - :group 'guix-output-list) - (let ((map guix-output-list-mode-map)) (define-key map (kbd "RET") 'guix-output-list-describe) (define-key map (kbd "x") 'guix-output-list-execute) @@ -721,9 +703,9 @@ The specification is suitable for `guix-process-output-actions'." "Describe outputs or packages marked with a general mark. If no entries are marked, describe the current output or package. With prefix (if ARG is non-nil), describe entries marked with any mark. -Also see `guix-output-list-describe-type'." +Also see `guix-package-info-type'." (interactive "P") - (if (eq guix-output-list-describe-type 'output) + (if (eq guix-package-info-type 'output) (guix-list-describe arg) (let* ((oids (or (apply #'guix-list-get-marked-id-list (unless arg '(general))) |