Use "go"/"gO" instead of "gd"/"gD" for "open" bindings

12 files changed, 29 insertions, 22 deletions

diff --git a/evil-arc-mode.el b/evil-arc-mode.el
index 832d9bb..24dc239 100644
--- a/evil-arc-mode.el
+++ b/evil-arc-mode.el
@@ -49,8 +49,7 @@
     (kbd "<return>") 'archive-extract
     (kbd "S-<return>") 'archive-extract-other-window
     (kbd "M-<return>") 'archive-view
-    "gd" 'archive-extract
-    "gD" 'archive-extract-other-window
+    "go" 'archive-extract-other-window
 
     "a" 'archive-alternate-display
     "d" 'archive-flag-deleted
diff --git a/evil-bookmark.el b/evil-bookmark.el
index b33a406..8e97873 100644
--- a/evil-bookmark.el
+++ b/evil-bookmark.el
@@ -58,6 +58,8 @@
     "W" 'bookmark-bmenu-locate
     "E" 'bookmark-bmenu-edit-annotation
     "D" 'bookmark-bmenu-delete-backwards
+
+    ;; open
     "o" 'bookmark-bmenu-select
     "O" 'bookmark-bmenu-other-window
     "go" 'bookmark-bmenu-other-window
diff --git a/evil-dired.el b/evil-dired.el
index 8bcd2a8..c7f6b0e 100644
--- a/evil-dired.el
+++ b/evil-dired.el
@@ -131,7 +131,6 @@
     "m" 'dired-mark
     "t" 'dired-toggle-marks
     "u" 'dired-unmark ; also "*u"
-    "go" 'dired-view-file ;; FIXME: Consolidate the find/view commands together.
     "W" 'browse-url-of-dired-file
     "x" 'dired-do-flagged-delete
     "gy" 'dired-show-file-type ;; FIXME: This could probably go on a better key.
@@ -141,7 +140,8 @@
     (kbd "<return>") 'dired-find-file
     (kbd "S-<return>") 'dired-find-file-other-window
     (kbd "M-<return>") 'dired-display-file
-    "gD" 'dired-find-file-other-window
+    "go" 'dired-find-file-other-window
+    "gO" 'dired-view-file
     ;; sort
     "o" 'dired-sort-toggle-or-edit
     ;; moving
diff --git a/evil-elfeed.el b/evil-elfeed.el
index 7bc3a82..2123ccb 100644
--- a/evil-elfeed.el
+++ b/evil-elfeed.el
@@ -38,7 +38,7 @@
     ;; open
     (kbd "<return>") 'elfeed-search-show-entry
     (kbd "S-<return>") 'elfeed-search-browse-url
-    "gd" 'elfeed-search-browse-url
+    "go" 'elfeed-search-browse-url
 
     "y" 'elfeed-search-yank
 
@@ -64,7 +64,7 @@
   (evil-set-initial-state 'elfeed-show-mode 'motion)
   (evil-define-key 'motion elfeed-show-mode-map
     (kbd "S-<return>") 'elfeed-show-visit
-    "gd" 'elfeed-show-visit
+    "go" 'elfeed-show-visit
 
     ;; filter
     "s" 'elfeed-show-new-live-search
diff --git a/evil-occur.el b/evil-occur.el
index 5d8ebb9..a3d7546 100644
--- a/evil-occur.el
+++ b/evil-occur.el
@@ -47,8 +47,7 @@
     (kbd "<return>") 'occur-mode-goto-occurrence
     (kbd "S-<return>") 'occur-mode-goto-occurrence-other-window
     (kbd "M-<return>") 'occur-mode-display-occurrence
-    "gd" 'occur-mode-goto-occurrence
-    "gD" 'occur-mode-goto-occurrence-other-window
+    "go" 'occur-mode-goto-occurrence-other-window
 
     "gj" 'occur-next
     "gk" 'occur-prev
diff --git a/evil-pdf.el b/evil-pdf.el
index fc005e4..58115f1 100644
--- a/evil-pdf.el
+++ b/evil-pdf.el
@@ -136,8 +136,7 @@
     (kbd "<return>") 'pdf-outline-follow-link-and-quit
     (kbd "S-<return>") 'pdf-outline-follow-link
     (kbd "M-<return>") 'pdf-outline-display-link
-    "gd" 'pdf-outline-follow-link-and-quit
-    "gD" 'pdf-outline-follow-link
+    "go" 'pdf-outline-follow-link
     "." 'pdf-outline-move-to-current-page
     (kbd "SPC") 'pdf-outline-select-pdf-window
 
diff --git a/evil-profiler.el b/evil-profiler.el
index a4ff3bc..d81111a 100644
--- a/evil-profiler.el
+++ b/evil-profiler.el
@@ -56,7 +56,6 @@
 
     ;; open
     (kbd "<return>") 'profiler-report-find-entry
-    "gd" 'profiler-report-find-entry
 
     ;; refresh
     "gr" 'revert-buffer
diff --git a/evil-rtags.el b/evil-rtags.el
index cd0a946..8a92938 100644
--- a/evil-rtags.el
+++ b/evil-rtags.el
@@ -43,6 +43,7 @@
   (evil-set-initial-state 'rtags-location-stack-visualize-mode 'normal)
 
   (evil-define-key 'normal rtags-mode-map
+    ;; open
     (kbd "<return>") 'rtags-select
     (kbd "S-<return>") 'rtags-select-other-window
     (kbd "M-<return>") 'rtags-show-in-other-window
@@ -50,7 +51,8 @@
     (kbd "gO") 'rtags-show-in-other-window
     [mouse-1] 'rtags-select-other-window
     [mouse-2] 'rtags-select-other-window
-    "s" 'rtags-show-in-other-window
+    "s" 'rtags-show-in-other-window ; TODO: Remove this binding?
+
     "c" 'rtags-select-caller
     "C" 'rtags-select-caller-other-window
     "x" 'rtags-select-and-remove-rtags-buffer
@@ -73,6 +75,7 @@
     "]" 'rtags-dependency-tree-next-level
     "[" 'rtags-dependency-tree-previous-level
 
+    ;; open
     (kbd "<return>") 'rtags-select
     (kbd "S-<return>") 'rtags-select-other-window
     (kbd "M-<return>") 'rtags-show-in-other-window
@@ -81,6 +84,7 @@
     [mouse-1] 'rtags-select-other-window
     [mouse-2] 'rtags-select-other-window
     "s" 'rtags-show-in-other-window
+
     "x" 'rtags-select-and-remove-rtags-buffer
     "q" 'rtags-call-bury-or-delete)
 
@@ -101,6 +105,7 @@
     "]" 'rtags-references-tree-next-level
     "[" 'rtags-references-tree-previous-level
 
+    ;; open
     (kbd "<return>") 'rtags-select
     (kbd "S-<return>") 'rtags-select-other-window
     (kbd "M-<return>") 'rtags-show-in-other-window
@@ -114,6 +119,7 @@
     "q" 'rtags-call-bury-or-delete)
 
   (evil-define-key 'normal rtags-location-stack-visualize-mode-map
+    ;; open
     (kbd "<return>") 'rtags-select
     (kbd "S-<return>") 'rtags-select-other-window
     (kbd "M-<return>") 'rtags-show-in-other-window
@@ -122,6 +128,7 @@
     [mouse-1] 'rtags-select-other-window
     [mouse-2] 'rtags-select-other-window
     "s" 'rtags-show-in-other-window
+
     "x" 'rtags-select-and-remove-rtags-buffer
     "q" 'rtags-call-bury-or-delete))
 
diff --git a/evil-transmission.el b/evil-transmission.el
index a8dd373..87ae5fc 100644
--- a/evil-transmission.el
+++ b/evil-transmission.el
@@ -93,8 +93,7 @@
     (kbd "<return>") 'transmission-find-file
     (kbd "S-<return>") 'transmission-find-file-other-window
     (kbd "M-<return>") 'transmission-display-file
-    "gd" 'transmission-find-file
-    "gD" 'transmission-find-file-other-window
+    "go" 'transmission-find-file-other-window
 
     "v" 'transmission-view-file
 
diff --git a/evil-vlf.el b/evil-vlf.el
index ed19eb5..c7716bd 100644
--- a/evil-vlf.el
+++ b/evil-vlf.el
@@ -67,7 +67,7 @@
     "E" 'vlf-ediff-buffers
 
     "g%" 'vlf-query-replace
-    "go" 'vlf-occur
+    "go" 'vlf-occur ; TODO: This binding clashes with "open".  Change?
     "L" 'vlf-goto-line
     "F" 'vlf-toggle-follow))
 
diff --git a/evil-xref.el b/evil-xref.el
index 8077a0b..7c5c65d 100644
--- a/evil-xref.el
+++ b/evil-xref.el
@@ -41,9 +41,11 @@
     "]" 'xref-next-line
     "[" 'xref-prev-line
     "r" 'xref-query-replace-in-results
-    (kbd "RET") 'xref-goto-xref
+
+    ;; open
+    (kbd "<return>") 'xref-goto-xref
     (kbd "S-<return>") 'xref-show-location-at-point
-    "o" 'xref-show-location-at-point
+    "o" 'xref-show-location-at-point ; TODO: Remove binding?
     "go" 'xref-show-location-at-point))
 
 (provide 'evil-xref)
diff --git a/readme.org b/readme.org
index fc5656e..97a3816 100644
--- a/readme.org
+++ b/readme.org
@@ -268,13 +268,14 @@ region, making this binding useless.
 - ~.~: go to current entity (day for calendar, playing track for [[EMMS][EMMS]]).
   Bind only if more relevant than ~evil-repeat~.
 
-*** Open thing at point (~RET~, ~S-RET~, ~M-RET~, ~gd~, ~gD~)
+*** Open thing at point (~RET~, ~S-RET~, ~M-RET~, ~go~, ~gO~)
 
-- ~RET~, ~S-RET~, ~M-RET~: Open thing at point in current window, open in other window and display in other window respectively.
-  The latter is like the former with the focus remaining on the current window.
+- ~RET~, ~S-RET~, ~M-RET~: Open thing at point in current window, open in other
+  window and display in other window respectively.  The latter is like the
+  former with the focus remaining on the current window.
 
-- ~gd~, ~gD~: When available, same as ~RET~ and ~S-RET~ respectively.  This is
-  useful in terminals where ~S-RET~ might not work.
+- ~go~, ~gO~: When available, same as ~S-RET~ and ~M-RET~ respectively.  This is
+  useful in terminals where ~S-RET~ and ~M-RET~ might not work.
 
 *** Emacs-style jumping (~J~)