From f7b81e6a0f395a02df9c882866deae0e397c2f72 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Mon, 30 Oct 2023 17:29:06 +0100
Subject: Improve diff-mode leader key handling

---
 tw/home/files/emacs-init.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tw/home/files')

diff --git a/tw/home/files/emacs-init.el b/tw/home/files/emacs-init.el
index eb600e1b..56db4fa6 100644
--- a/tw/home/files/emacs-init.el
+++ b/tw/home/files/emacs-init.el
@@ -655,9 +655,8 @@ For use in `org-latex-classes'."
   (evil-set-leader '(normal visual) (kbd "\\") t)  ; <localleader>
   ;; For some reason, in `diff-mode', space isn't assigned to the leader key
   ;; automatically, unlike in other modes.
-  (evil-define-key '(normal visual) diff-mode-shared-map  ; not `diff-mode-map', else toggling `read-only-mode' destroys the binding
-    (kbd "SPC") #'evil-send-leader
-    (kbd "\\") #'evil-send-localleader)
+  (evil-define-key '(normal motion) diff-mode-shared-map  ; not `diff-mode-map', else toggling `read-only-mode' destroys the binding
+    (kbd "<localleader>\\") #'read-only-mode)   ; mirror default binding from evil-collection
   (evil-define-key '(normal insert visual replace) 'global
     (kbd "C-s") #'save-buffer)
   ;; Global major-mode-independent keys should be defined here. Major
@@ -710,6 +709,7 @@ For use in `org-latex-classes'."
   :config (evil-collection-init)
   :diminish evil-collection-unimpaired-mode
   :custom
+  (evil-collection-key-blacklist '("SPC" "\\") "Don't bind to our leader keys at all.")
   (evil-collection-setup-minibuffer t "Use evil-collection in minibuffer to match `evil-want-minibuffer'."))
 
 (use-package evil-org
-- 
cgit v1.2.3