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.el | |
parent | 2e269860c48696ca6fd0a76315a85ca3fd1ee3bc (diff) | |
download | guix-3472bb20c5521f9dc85404a4dab9abef11c87a22.tar guix-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.el')
-rw-r--r-- | emacs/guix.el | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/emacs/guix.el b/emacs/guix.el index f6e2023ea5..a1425161c4 100644 --- a/emacs/guix.el +++ b/emacs/guix.el @@ -57,25 +57,19 @@ SEARCH-VALS. Results are displayed in the list buffer, unless a single package is found and `guix-list-single-package' is nil." - (let* ((list-params (guix-get-params-for-receiving - 'list guix-package-list-type)) - (packages (guix-get-entries guix-package-list-type - search-type search-vals - list-params))) + (let ((packages (guix-get-entries guix-package-list-type + search-type search-vals + (guix-get-params-for-receiving + 'list guix-package-list-type)))) (if (or guix-list-single-package (cdr packages)) (guix-set-buffer packages 'list guix-package-list-type search-type search-vals) - (let* ((info-params (guix-get-params-for-receiving - 'info guix-package-list-type)) - (packages (if (equal list-params info-params) - packages - ;; If we don't have required info, we should - ;; receive it again - (guix-get-entries guix-package-list-type - search-type search-vals - info-params)))) - (guix-set-buffer packages 'info guix-package-list-type + (let ((packages (guix-get-entries guix-package-info-type + search-type search-vals + (guix-get-params-for-receiving + 'info guix-package-info-type)))) + (guix-set-buffer packages 'info guix-package-info-type search-type search-vals))))) (defun guix-get-show-generations (search-type &rest search-vals) |