[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/37: emacs: Add 'guix-ui-read-profile'.
From: |
Alex Kost |
Subject: |
35/37: emacs: Add 'guix-ui-read-profile'. |
Date: |
Fri, 18 Dec 2015 18:51:35 +0000 |
alezost pushed a commit to branch wip-refactor-emacs-ui
in repository guix.
commit 5e5f34478fcffc372e0a2d3c086bb2dd519778f1
Author: Alex Kost <address@hidden>
Date: Fri Dec 18 11:34:48 2015 +0300
emacs: Add 'guix-ui-read-profile'.
* emacs/guix-ui.el (guix-ui-read-profile): New procedure.
* emacs/guix-ui-package.el (guix-search-by-name)
(guix-search-by-regexp, guix-installed-packages)
(guix-obsolete-packages, guix-all-available-packages)
(guix-newest-available-packages): Use it.
* emacs/guix-ui-generation.el (guix-generations)
(guix-last-generations, guix-generations-by-time): Use it.
---
emacs/guix-ui-generation.el | 10 +++-------
emacs/guix-ui-package.el | 23 ++++++-----------------
emacs/guix-ui.el | 7 +++++++
3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/emacs/guix-ui-generation.el b/emacs/guix-ui-generation.el
index 040e585..aa71645 100644
--- a/emacs/guix-ui-generation.el
+++ b/emacs/guix-ui-generation.el
@@ -401,9 +401,7 @@ GENERATION is a generation number of the current profile."
"Display information about all generations.
If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
- (interactive
- (list (and current-prefix-arg
- (guix-profile-prompt))))
+ (interactive (list (guix-ui-read-profile)))
(guix-generation-get-display profile 'all))
;;;###autoload
@@ -413,8 +411,7 @@ If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
(interactive
(list (read-number "The number of last generations: ")
- (and current-prefix-arg
- (guix-profile-prompt))))
+ (guix-ui-read-profile)))
(guix-generation-get-display profile 'last number))
;;;###autoload
@@ -426,8 +423,7 @@ Interactively with prefix, prompt for PROFILE."
(interactive
(list (guix-read-date "Find generations (from): ")
(guix-read-date "Find generations (to): ")
- (and current-prefix-arg
- (guix-profile-prompt))))
+ (guix-ui-read-profile)))
(guix-generation-get-display profile 'time
(float-time from)
(float-time to)))
diff --git a/emacs/guix-ui-package.el b/emacs/guix-ui-package.el
index abba13f..9f45fc1 100644
--- a/emacs/guix-ui-package.el
+++ b/emacs/guix-ui-package.el
@@ -888,8 +888,7 @@ If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
(interactive
(list (read-string "Package name: " nil 'guix-package-search-history)
- (and current-prefix-arg
- (guix-profile-prompt))))
+ (guix-ui-read-profile)))
(guix-package-get-display profile 'name name))
;;;###autoload
@@ -902,9 +901,7 @@ If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
(interactive
(list (read-regexp "Regexp: " nil 'guix-package-search-history)
- nil
- (and current-prefix-arg
- (guix-profile-prompt))))
+ nil (guix-ui-read-profile)))
(guix-package-get-display profile 'regexp regexp
(or params guix-package-search-params)))
@@ -913,9 +910,7 @@ Interactively with prefix, prompt for PROFILE."
"Display information about installed Guix packages.
If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
- (interactive
- (list (and current-prefix-arg
- (guix-profile-prompt))))
+ (interactive (list (guix-ui-read-profile)))
(guix-package-get-display profile 'installed))
;;;###autoload
@@ -923,9 +918,7 @@ Interactively with prefix, prompt for PROFILE."
"Display information about obsolete Guix packages.
If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
- (interactive
- (list (and current-prefix-arg
- (guix-profile-prompt))))
+ (interactive (list (guix-ui-read-profile)))
(guix-package-get-display profile 'obsolete))
;;;###autoload
@@ -933,9 +926,7 @@ Interactively with prefix, prompt for PROFILE."
"Display information about all available Guix packages.
If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
- (interactive
- (list (and current-prefix-arg
- (guix-profile-prompt))))
+ (interactive (list (guix-ui-read-profile)))
(guix-package-get-display profile 'all-available))
;;;###autoload
@@ -943,9 +934,7 @@ Interactively with prefix, prompt for PROFILE."
"Display information about the newest available Guix packages.
If PROFILE is nil, use `guix-current-profile'.
Interactively with prefix, prompt for PROFILE."
- (interactive
- (list (and current-prefix-arg
- (guix-profile-prompt))))
+ (interactive (list (guix-ui-read-profile)))
(guix-package-get-display profile 'newest-available))
(provide 'guix-ui-package)
diff --git a/emacs/guix-ui.el b/emacs/guix-ui.el
index 7b63e63..7fef7c3 100644
--- a/emacs/guix-ui.el
+++ b/emacs/guix-ui.el
@@ -47,6 +47,13 @@ generations in 'list' and 'info' buffers.")
(guix-buffer-define-current-args-accessors
"guix-ui-current" "profile" "search-type" "search-values")
+(defun guix-ui-read-profile ()
+ "Return `guix-current-profile' or prompt for it.
+This function is intended for using in `interactive' forms."
+ (if current-prefix-arg
+ (guix-profile-prompt)
+ guix-current-profile))
+
(defun guix-ui-get-entries (profile entry-type search-type search-values
&optional params)
"Receive ENTRY-TYPE entries for PROFILE.
- 18/37: emacs: info: Split 'guix-info-format' variable., (continued)
- 18/37: emacs: info: Split 'guix-info-format' variable., Alex Kost, 2015/12/18
- 23/37: emacs: Generalize buffer reverting., Alex Kost, 2015/12/18
- 27/37: emacs: info: Get rid of syntactic fontification., Alex Kost, 2015/12/18
- 17/37: emacs: Factorize macros for defining interfaces., Alex Kost, 2015/12/18
- 31/37: emacs: Add 'list-single' variables., Alex Kost, 2015/12/18
- 29/37: emacs: Reorganize 'readers' code., Alex Kost, 2015/12/18
- 32/37: emacs: Add 'guix-list-get-display-entries'., Alex Kost, 2015/12/18
- 33/37: emacs: Return nil instead of "" in completing readers., Alex Kost, 2015/12/18
- 37/37: emacs: Use "B" key to display latest builds in package list., Alex Kost, 2015/12/18
- 26/37: emacs: Generalize buffer naming., Alex Kost, 2015/12/18
- 35/37: emacs: Add 'guix-ui-read-profile'.,
Alex Kost <=
- 34/37: emacs: Add hierarchy of customization groups., Alex Kost, 2015/12/18
- 16/37: emacs: info: Generalize inserting and formatting., Alex Kost, 2015/12/18
- 36/37: emacs: Add Hydra interface., Alex Kost, 2015/12/18
- 28/37: emacs: Generalize buffer interface., Alex Kost, 2015/12/18
- 30/37: emacs: Reorganize package/generation UI code., Alex Kost, 2015/12/18