From 55c7555c004a8ea72020e54ff34d6f07a344be0a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 2 Jan 2017 05:42:16 -0500
Subject: [PATCH] Fix #19: don't hijack Tab in magit buffers or in org-mode

---
 core/core-vcs.el      | 3 ++-
 modules/module-org.el | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/core-vcs.el b/core/core-vcs.el
index d08e3f5ed..bb9ff1c00 100644
--- a/core/core-vcs.el
+++ b/core/core-vcs.el
@@ -52,8 +52,9 @@
 (use-package magit
   :commands (magit-status)
   :config
-  ;; Prevent magit and evil-snipe conflicts
+  ;; Prevent magit + evil-snipe conflicts
   (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)
+  (map! :map magit-mode-map :m "<tab>" 'magit-section-toggle)
   (require 'evil-magit))
 
 (after! vc-annotate
diff --git a/modules/module-org.el b/modules/module-org.el
index cdcf3947a..766b38003 100644
--- a/modules/module-org.el
+++ b/modules/module-org.el
@@ -250,7 +250,7 @@
           :ni "C-S-h" 'doom/org-table-prepend-field-or-shift-left
           :ni "C-S-k" 'doom/org-table-prepend-row-or-shift-up
           :ni "C-S-j" 'doom/org-table-append-row-or-shift-down
-
+          ;; Navigate table cells
           :i  "C-L" 'doom/org-table-next-field
           :i  "C-H" 'doom/org-table-previous-field
           :i  "C-K" 'doom/org-table-previous-row
@@ -258,8 +258,11 @@
 
           :i  "C-e" 'org-end-of-line
           :i  "C-a" 'org-beginning-of-line
-          :i  "<tab>"   'doom/org-indent
-          :i  "<S-tab>" 'doom/org-dedent
+
+          :i  "<tab>" 'doom/org-indent-or-next-field
+          :i  [S-iso-lefttab] 'doom/org-dedent-or-prev-field ; for GNU Emacs
+          :i  [(shift tab)] 'doom/org-dedent-or-prev-field
+          :i  [backtab] 'doom/org-dedent-or-prev-field
 
           :nv "j"   'evil-next-visual-line
           :nv "k"   'evil-previous-visual-line