From 1a275b3fd64040239a09a1c37fbf3b90671c1204 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Mon, 29 Apr 2024 12:26:00 -0700
Subject: [PATCH] Fix avy (in some places)

---
 thoom-emacs/modules/thoom-editing.el | 5 ++---
 thoom-emacs/modules/thoom-git.el     | 7 ++++++-
 thoom-emacs/modules/thoom-org.el     | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/thoom-emacs/modules/thoom-editing.el b/thoom-emacs/modules/thoom-editing.el
index 9315604..cfcbe30 100644
--- a/thoom-emacs/modules/thoom-editing.el
+++ b/thoom-emacs/modules/thoom-editing.el
@@ -23,14 +23,13 @@
 
 (use-package avy
   :ensure t
+  :defer nil
   :bind
   (("C-j" . avy-goto-char-timer)
    ([remap goto-line] . avy-goto-line)
-   :map org-mode-map
-   ("C-j" . nil)
    :map isearch-mode-map
    ("C-j" . avy-isearch)
-   :map magit-file-section-map
+   :map lisp-interaction-mode-map
    ("C-j" . nil))
 
   :init
diff --git a/thoom-emacs/modules/thoom-git.el b/thoom-emacs/modules/thoom-git.el
index ce86518..4e4a7c7 100644
--- a/thoom-emacs/modules/thoom-git.el
+++ b/thoom-emacs/modules/thoom-git.el
@@ -7,4 +7,9 @@
   :bind (("C-x g" . magit-status)
          :map magit-mode-map
          (":" . execute-extended-command)
-         ("x" . magit-discard)))
+         ("x" . magit-discard)
+         :map magit-diff-section-map
+         ("C-j" . nil)
+         :map magit-file-section-map
+         ;; Unbind to stop overriding avy
+         ("C-j" . nil)))
diff --git a/thoom-emacs/modules/thoom-org.el b/thoom-emacs/modules/thoom-org.el
index fde8df9..4eee194 100644
--- a/thoom-emacs/modules/thoom-org.el
+++ b/thoom-emacs/modules/thoom-org.el
@@ -2,7 +2,8 @@
 
 (use-package org
   :bind (("C-c o ," . thoom/org-clear-all)
-         ("C-c SPC" . org-table-blank-field))
+         ;; Unbind to make room for avy
+         ("C-j" . nil))
   :custom
   (org-todo-keywords '((sequence "TODO(t)" "BLOCKED(b)" "|" "DONE(d)"))))