From 97170f90bf241501ea7611c14119328948011edc Mon Sep 17 00:00:00 2001
From: David Florness <david@florness.com>
Date: Sun, 26 Apr 2026 19:59:50 -0400
Subject: [PATCH] switch off of my evil-collection fork by moving custom code
 to :config

---
 lisp/keys.el                 | 15 +++++++++++----
 straight/versions/default.el |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lisp/keys.el b/lisp/keys.el
index e9f1c43..1c56bbc 100644
--- a/lisp/keys.el
+++ b/lisp/keys.el
@@ -45,12 +45,19 @@
 ;; Evil-like bindings for various modes
 (use-package evil-collection
   :custom (evil-collection-magit-use-$-for-end-of-line nil)
-  :straight (evil-collection
-             :type git :host github :repo "emacs-evil/evil-collection"
-             :fork (:host github :repo "edwargix/evil-collection"))
   :after evil
   :init
-  (evil-collection-init))
+  (evil-collection-init)
+  :config
+  ;; I don't like these evil-collection keybindings in view-mode, so I disable
+  ;; them manually
+  (advice-add #'evil-collection-view-setup :after
+              (lambda ()
+                (evil-define-key* 'normal view-mode-map
+                  "+" nil
+                  "=" nil
+                  "0" nil
+                  "-" nil))))
 
 ;; Easily surround text
 (use-package evil-surround
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 28cbe94..5e12efa 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -47,7 +47,7 @@
  ("emacsql" . "2fe6d4562b32a170a750d5e80514fbb6b6694803")
  ("engine-mode" . "e7f317f1b284853b6df4dfd37ab7715b248e0ebd")
  ("evil" . "729d9a58b387704011a115c9200614e32da3cefc")
- ("evil-collection" . "4ec98d88f1955209c16986057ea36447b2f01d1d")
+ ("evil-collection" . "6b38c3d3bbdddba242386644fe49f04b8fdc13cd")
  ("evil-matchit" . "dd03aacd8602ffd2cd9b67d0072092f8d57d5e01")
  ("evil-numbers" . "616aff9e5cee012954756ed2715209fa90308cdf")
  ("evil-org-mode" . "b1f309726b1326e1a103742524ec331789f2bf94")
-- 
2.38.4