Normalize mark bindings

9 files changed, 46 insertions, 34 deletions

diff --git a/evil-collection-bookmark.el b/evil-collection-bookmark.el
index 5a4f6e0..fb0bc8d 100644
--- a/evil-collection-bookmark.el
+++ b/evil-collection-bookmark.el
@@ -45,8 +45,6 @@
     "1" 'bookmark-bmenu-1-window
     "x" 'bookmark-bmenu-execute-deletions
     "d" 'bookmark-bmenu-delete
-    "u" 'bookmark-bmenu-unmark
-    "m" 'bookmark-bmenu-mark
     "/" 'bookmark-bmenu-search
     "r" 'bookmark-bmenu-rename
     "R" 'bookmark-bmenu-relocate
@@ -59,6 +57,10 @@
     "E" 'bookmark-bmenu-edit-annotation
     "D" 'bookmark-bmenu-delete-backwards
 
+    ;; mark
+    "u" 'bookmark-bmenu-unmark
+    "m" 'bookmark-bmenu-mark
+
     ;; open
     "o" 'bookmark-bmenu-select
     "O" 'bookmark-bmenu-other-window
diff --git a/evil-collection-buff-menu.el b/evil-collection-buff-menu.el
index ed41746..143bce9 100644
--- a/evil-collection-buff-menu.el
+++ b/evil-collection-buff-menu.el
@@ -78,11 +78,6 @@ When called interactively prompt for MARK;  RET remove all marks."
     "go" 'Buffer-menu-this-window
     "gO" 'Buffer-menu-other-window
     "d" 'Buffer-menu-delete
-    "u" 'Buffer-menu-unmark
-    "U" (if (< emacs-major-version 26)
-            'evil-collection-buff-menu-Buffer-menu-unmark-all
-          'Buffer-menu-unmark-all)
-    "m" 'Buffer-menu-mark
     "s" 'Buffer-menu-save
     [mouse-2] 'Buffer-menu-mouse-select
     [follow-link] 'mouse-face
@@ -92,6 +87,13 @@ When called interactively prompt for MARK;  RET remove all marks."
     "gV" 'Buffer-menu-view
     "v" 'evil-visual-char
 
+    ;; mark
+    "u" 'Buffer-menu-unmark
+    "U" (if (< emacs-major-version 26)
+            'evil-collection-buff-menu-Buffer-menu-unmark-all
+          'Buffer-menu-unmark-all)
+    "m" 'Buffer-menu-mark
+
     "f" 'evil-find-char
     "e" 'evil-forward-word-end
     "b" 'evil-backward-word-begin
diff --git a/evil-collection-epa.el b/evil-collection-epa.el
index 2567df9..ac6a243 100644
--- a/evil-collection-epa.el
+++ b/evil-collection-epa.el
@@ -34,8 +34,6 @@
 (defun evil-collection-epa-setup ()
   (evil-define-key 'normal epa-key-list-mode-map
     (kbd "<tab>") 'widget-forward
-    "m" 'epa-mark-key
-    "u" 'epa-unmark-key
     "gr" 'revert-buffer
     "q" 'epa-exit-buffer
     "E" 'epa-decrypt-file
@@ -44,6 +42,10 @@
     "ZQ" 'evil-quit
     "V" 'epa-verify-file
 
+    ;; mark
+    "m" 'epa-mark-key
+    "u" 'epa-unmark-key
+
     ;; Unchanged keybindings.
     "s" 'epa-sign-file
     "e" 'epa-encrypt-file
diff --git a/evil-collection-ibuffer.el b/evil-collection-ibuffer.el
index a941cb7..93af038 100644
--- a/evil-collection-ibuffer.el
+++ b/evil-collection-ibuffer.el
@@ -40,15 +40,17 @@
                   'ibuffer-mark-for-delete-backwards))
 
   (evil-define-key 'normal ibuffer-mode-map
-    (kbd "m") 'ibuffer-mark-forward
-    (kbd "t") 'ibuffer-toggle-marks
-    (kbd "u") 'ibuffer-unmark-forward
     (kbd "=") 'ibuffer-diff-with-file
     (kbd "J") 'ibuffer-jump-to-buffer
     (kbd "M-g") 'ibuffer-jump-to-buffer
     (kbd "M-s a C-s") 'ibuffer-do-isearch
     (kbd "M-s a M-C-s") 'ibuffer-do-isearch-regexp
     (kbd "M-s a C-o") 'ibuffer-do-occur
+
+    ;; mark
+    (kbd "m") 'ibuffer-mark-forward
+    (kbd "~") 'ibuffer-toggle-marks
+    (kbd "u") 'ibuffer-unmark-forward
     (kbd "DEL") 'ibuffer-unmark-backward
     (kbd "M-DEL") 'ibuffer-unmark-all
     (kbd "* *") 'ibuffer-unmark-all
@@ -152,7 +154,7 @@
 
     (kbd "|") 'ibuffer-do-shell-command-pipe
     (kbd "!") 'ibuffer-do-shell-command-file
-    (kbd "~") 'ibuffer-do-toggle-modified
+    (kbd "t") 'ibuffer-do-toggle-modified
     ;; marked operations
     (kbd "A") 'ibuffer-do-view
     (kbd "D") 'ibuffer-do-delete
diff --git a/evil-collection-pdf.el b/evil-collection-pdf.el
index 03a3a0e..22432fd 100644
--- a/evil-collection-pdf.el
+++ b/evil-collection-pdf.el
@@ -185,7 +185,7 @@
     "m" 'tablist-mark-forward
     "~" 'tablist-toggle-marks
     "u" 'tablist-unmark-forward
-    "M" 'tablist-unmark-all-marks
+    "U" 'tablist-unmark-all-marks
     "*!" 'tablist-unmark-all-marks
     "*c" 'tablist-change-marks
     "*n" 'tablist-mark-items-numeric
diff --git a/evil-collection-proced.el b/evil-collection-proced.el
index f5d7bd6..41a2312 100644
--- a/evil-collection-proced.el
+++ b/evil-collection-proced.el
@@ -41,7 +41,8 @@
     ;; TODO: Implement a proced-toggle-mark?
     "m" 'proced-mark ; Mentioned in documentation, should be followed.
     "*" 'proced-mark-all
-    "M" 'proced-unmark-all
+    "M" 'proced-mark-all
+    "U" 'proced-unmark-all
     "~" 'proced-toggle-marks
     "c" 'proced-mark-children
     "C" 'proced-mark-children ; Emacs has "C"
diff --git a/evil-collection-prodigy.el b/evil-collection-prodigy.el
index 957d44c..d081cce 100644
--- a/evil-collection-prodigy.el
+++ b/evil-collection-prodigy.el
@@ -41,7 +41,7 @@
     "gg" 'prodigy-first
     "G" 'prodigy-last
 
-    ;; TODO: Marking subject to change.
+    ;; mark
     "m" 'prodigy-mark
     "*t" 'prodigy-mark-tag
     "M" 'prodigy-mark-all
diff --git a/evil-collection-reftex.el b/evil-collection-reftex.el
index 607f7c3..92a6b9c 100644
--- a/evil-collection-reftex.el
+++ b/evil-collection-reftex.el
@@ -43,11 +43,11 @@
 ;; original at reftex-ref.el
 (setq reftex-select-label-help
   " j / k      Go to next/previous label (Cursor motion works as well)
- [ / ]      Go to previous/next section heading.	
- c          Reuse last referenced label.	
+ [ / ]      Go to previous/next section heading.
+ c          Reuse last referenced label.
  J          Jump to a specific section, e.g. '3 J' jumps to section 3.
- s          Switch label type.	
- gr         Reparse document.	
+ s          Switch label type.
+ gr         Reparse document.
  go / gO     Show context / Show insertion point.
  S          Switch to label menu of external document (with LaTeX package `xr').
  r / R      Toggle \\ref <-> \\vref / Rotate \\ref <=> \\fref <=> \\Fref.
@@ -72,7 +72,7 @@
 
   (evil-set-initial-state 'reftex-select-label-mode 'normal)
   (evil-set-initial-state 'reftex-select-bib-mode 'normal)
-  
+
   (evil-define-key 'normal reftex-select-shared-map
     "j" 'reftex-select-next
     "k" 'reftex-select-previous
@@ -82,7 +82,7 @@
     (kbd "gk") 'reftex-select-previous-heading
     (kbd "C-j") 'reftex-select-next-heading
     (kbd "C-k") 'reftex-select-previous-heading
-    "go" 'reftex-select-callback ;shows the point where the label is
+    "go" 'reftex-select-callback        ;shows the point where the label is
     "gr" (lambda nil "Press `?' during selection to find out
     about this key" (interactive) (throw (quote myexit) 114)) ;reftex binds keys in a very arcane way using the number asigned by describe-char, in this case the value of "g" is 114
     "q" 'reftex-select-quit
@@ -95,9 +95,6 @@
     (kbd "<tab>") 'reftex-select-read-label
     "s" (lambda nil "Press `?' during selection to find out
     about this key." (interactive) (throw (quote myexit) 115))
-    "m" 'reftex-select-mark
-    "M" 'reftex-select-unmark ;a mark/unmark function would help here
-    "u" 'reftex-select-unmark ;does not causes problems with undo
     "x" (lambda nil "Press `?' during selection to find out
     about this key." (interactive) (throw (quote myexit) 97))
     "X" (lambda nil "Press `?' during selection to find out
@@ -106,14 +103,18 @@
     about this key." (interactive) (throw (quote myexit) 120))
     "r" 'reftex-select-cycle-ref-style-forward
     "R" 'reftex-select-cycle-ref-style-backward
-    "gO" 'reftex-select-show-insertion-point 
+    "gO" 'reftex-select-show-insertion-point
     "o" (lambda nil "Press `?' during selection to find out
     about this key." (interactive) (throw (quote myexit) 101))
     "O" (lambda nil "Press `?' during selection to find out
-    about this key." (interactive) (throw (quote myexit) 69)))
+    about this key." (interactive) (throw (quote myexit) 69))
+
+    ;; mark
+    "m" 'reftex-select-mark             ; TODO: Need a mark toggle function.
+    "u" 'reftex-select-unmark)
 
   (evil-set-initial-state 'reftex-toc-mode 'normal)
-  
+
   ;; This one is more involved, in reftex-toc.el, line 282 it shows the prompt
   ;; string with the keybinds and I don't see any way of changing it to show evil-like binds.
   (evil-define-key 'normal reftex-toc-mode-map
diff --git a/evil-collection-transmission.el b/evil-collection-transmission.el
index 32309a3..851e4ce 100644
--- a/evil-collection-transmission.el
+++ b/evil-collection-transmission.el
@@ -52,18 +52,18 @@
     "a" 'transmission-add
     ;; "D" 'transmission-delete ; Useless with `transmission-remove'?
     "r" 'transmission-move
-    "d" 'transmission-remove
+    "D" 'transmission-remove
     "x" 'transmission-toggle ; EMMS has "x" for pause.
     "t" 'transmission-trackers-add
     "c" 'transmission-verify ; "c" for "[c]heck".
-    "D" 'transmission-set-download
-    "U" 'transmission-set-upload
+    "d" 'transmission-set-download
+    "u" 'transmission-set-upload
     "S" 'transmission-set-ratio ; "S" for "[S]eed"
     "P" 'transmission-set-bandwidth-priority
 
     ;; mark
     "m" 'transmission-toggle-mark
-    "M" 'transmission-unmark-all
+    "U" 'transmission-unmark-all
     "~" 'transmission-invert-marks
 
     ;; refresh
@@ -88,10 +88,12 @@
     "i" 'transmission-info
 
     "r" 'transmission-move
-    "u" 'transmission-files-unwant
-    "U" 'transmission-files-want
     "P" 'transmission-files-priority
 
+    ;; mark
+    "u" 'transmission-files-unwant
+    "m" 'transmission-files-want
+
     ;; open
     (kbd "<return>") 'transmission-find-file
     (kbd "S-<return>") 'transmission-find-file-other-window