From d950ed3f6892236efbb51c2229a50a6d33e92318 Mon Sep 17 00:00:00 2001
From: crocket <748856+crocket@users.noreply.github.com>
Date: Fri, 31 Jan 2020 21:44:55 +0900
Subject: Add `g TAB` as a fallback for `<tab>`. Make RET bindings work.

* `g TAB` is a good fallback for `<tab>` in terminal
environments.
* `RET` can take care of Enter on GUI and in terminal
environments.
* `M-RET` can take care of Alt+Enter on GUI and in terminal
environments.
* `S-<return>` is removed because it is redundant.
---
 evil-org-agenda.el | 5 +++--
 evil-org.el        | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/evil-org-agenda.el b/evil-org-agenda.el
index 433089e..be53e92 100644
--- a/evil-org-agenda.el
+++ b/evil-org-agenda.el
@@ -50,9 +50,10 @@
 
     ;; open
     (kbd "<tab>") 'org-agenda-goto
-    (kbd "<return>") 'org-agenda-switch-to
     (kbd "S-<return>") 'org-agenda-goto
-    (kbd "M-<return>") 'org-agenda-recenter
+    (kbd "g TAB") 'org-agenda-goto
+    (kbd "RET") 'org-agenda-switch-to
+    (kbd "M-RET") 'org-agenda-recenter
 
     (kbd "SPC") 'org-agenda-show-and-scroll-up
     (kbd "<delete>") 'org-agenda-show-scroll-down
diff --git a/evil-org.el b/evil-org.el
index 9bf7ff6..8057cb0 100644
--- a/evil-org.el
+++ b/evil-org.el
@@ -657,7 +657,8 @@ Includes tables, list items and subtrees."
                           org-insert-todo-heading-respect-content))
   (evil-define-key '(normal visual) evil-org-mode-map
     (kbd "<tab>") 'org-cycle
-    (kbd "<S-tab>") 'org-shifttab
+    (kbd "g TAB") 'org-cycle
+    (kbd "<backtab>") 'org-shifttab
     (kbd "<") 'evil-org-<
     (kbd ">") 'evil-org->))
 
-- 
cgit v1.0