From b5282059f266187c5ee9bcc2483e712a48b43723 Mon Sep 17 00:00:00 2001
From: Howard Abrams <howard.abrams@workday.com>
Date: Tue, 9 Nov 2021 17:25:32 -0800
Subject: [PATCH] Attempt to resolve the snipe/surround fiasco

Loading them serially seems to fix it.
---
 ha-config.org | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ha-config.org b/ha-config.org
index d6540e7..10c9d93 100644
--- a/ha-config.org
+++ b/ha-config.org
@@ -647,14 +647,15 @@ Consult users will also want the embark-consult package.
 Doom introduced me to [[https://github.com/hlissner/evil-snipe][evil-snipe]] which is similar to =f= and =t=, but does two characters, and can, when configured, search more than the current line:
 
 #+BEGIN_SRC emacs-lisp
-(use-package evil-snipe
-  :init
-  (setq evil-snipe-scope 'visible)
-  :config
-  (evil-define-key '(normal motion operator visual)
-      "s" #'evil-snipe-s
-      "S" #'evil-snipe-S)
-  (evil-snipe-mode +1))
+  (use-package evil-snipe
+    :after evil
+    :init
+    (setq evil-snipe-scope 'visible)
+    :config
+    (evil-define-key '(normal motion operator visual)
+	"s" #'evil-snipe-s
+	"S" #'evil-snipe-S)
+    (evil-snipe-mode +1))
 #+END_SRC
 
 It highlights all potential matches, use ~;~ to skip to the next match, and ~,~ to jump back.
@@ -663,6 +664,7 @@ I like both [[https://github.com/emacs-evil/evil-surround][evil-surround]] and H
 
 #+BEGIN_SRC emacs-lisp
   (use-package evil-surround
+    :after evil-snipe
     :config
     (dolist (state '(normal motion operator visual))
       (evil-define-key state evil-surround-mode-map "z" 'evil-surround-edit)