Skip to content

Commit 33cbe81

Browse files
committed
elpaca-ui-mode-map: move view commands to prefix key
Avoid capital/lowercase variants for commands which were vying for the same spot in a single keymap (e.g. elpaca-merge and elpaca-manager). Add binding for elpaca-mark-pull. This also has the benefit of avoiding most of the evil-mode bindings one would be interested in for such a mode.
1 parent 9c99316 commit 33cbe81

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

elpaca-ui.el

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,27 +141,34 @@ exclamation point to it. e.g. !#installed."
141141
;;;; Variables:
142142
(defvar-local elpaca-ui--search-timer nil "Timer to debounce search input.")
143143
(defvar-local elpaca-ui--prev-entry-count nil "Number of previously recorded entries.")
144+
145+
(defvar elpaca-ui-view-map
146+
(let ((m (make-sparse-keymap)))
147+
(define-key m (kbd "a") (elpaca-defsearch marked "#unique #marked"))
148+
(define-key m (kbd "i") (elpaca-defsearch installed "#unique #installed"))
149+
(define-key m (kbd "l") 'elpaca-log)
150+
(define-key m (kbd "m") 'elpaca-manager)
151+
(define-key m (kbd "o") (elpaca-defsearch orphaned "#unique #orphan"))
152+
(define-key m (kbd "r") 'elpaca-ui-search-refresh)
153+
(define-key m (kbd "t") (elpaca-defsearch tried "#unique #installed !#declared"))
154+
m)
155+
"Keymap for `elpaca-ui-mode' views.")
156+
144157
(defvar elpaca-ui-mode-map
145158
(let ((m (make-sparse-keymap)))
146159
(define-key m (kbd "RET") 'elpaca-ui-info)
147160
(define-key m (kbd "!") 'elpaca-ui-send-input)
148161
(define-key m (kbd "+") 'elpaca-ui-show-hidden-rows)
149-
(define-key m (kbd "I") (elpaca-defsearch installed "#unique #installed"))
150-
(define-key m (kbd "M") (elpaca-defsearch marked "#unique #marked"))
151-
(define-key m (kbd "O") (elpaca-defsearch orphaned "#unique #orphan"))
152-
(define-key m (kbd "R") 'elpaca-ui-search-refresh)
153-
(define-key m (kbd "T") (elpaca-defsearch tried "#unique #installed !#declared"))
154-
(define-key m (kbd "U") 'elpaca-ui-unmark)
155162
(define-key m (kbd "b") 'elpaca-ui-browse-package)
156163
(define-key m (kbd "d") 'elpaca-ui-mark-delete)
157164
(define-key m (kbd "f") 'elpaca-ui-mark-fetch)
165+
(define-key m (kbd "g") elpaca-ui-view-map)
158166
(define-key m (kbd "i") 'elpaca-ui-mark-try)
159-
(define-key m (kbd "l") 'elpaca-log)
160-
(define-key m (kbd "m") 'elpaca-manager)
167+
(define-key m (kbd "m") 'elpaca-ui-mark-merge)
168+
(define-key m (kbd "p") 'elpaca-ui-mark-pull)
161169
(define-key m (kbd "r") 'elpaca-ui-mark-rebuild)
162170
(define-key m (kbd "s") 'elpaca-ui-search)
163-
(define-key m (kbd "t") 'elpaca-status)
164-
(define-key m (kbd "u") 'elpaca-ui-mark-merge)
171+
(define-key m (kbd "u") 'elpaca-ui-unmark)
165172
(define-key m (kbd "v") 'elpaca-ui-visit)
166173
(define-key m (kbd "x") 'elpaca-ui-execute-marks)
167174
m)

0 commit comments

Comments
 (0)