From 94a4c41a46f52b3c1fe94b4a12dac17ce80a4a46 Mon Sep 17 00:00:00 2001
From: Daniel Fichtinger <daniel@ficd.ca>
Date: Wed, 25 Jun 2025 15:24:08 -0400
Subject: [PATCH] AutoYADM commit: 2025-06-25 15:24:08

---
 .config/kak/autoload/search-highlight.kak | 53 ++++++++++++++++++-----
 .config/kak/kakrc                         |  4 ++
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/.config/kak/autoload/search-highlight.kak b/.config/kak/autoload/search-highlight.kak
index 573fd2a6..cf6cf5c8 100644
--- a/.config/kak/autoload/search-highlight.kak
+++ b/.config/kak/autoload/search-highlight.kak
@@ -1,16 +1,49 @@
 provide-module search-highlight %—
-    declare-option -hidden bool search_highlight false
-    def -hidden -override true nop
-    def -hidden -override false fail
-    define-command search-highlight-enable %{
-        # hook -group search-highlight window RegisterModified '/' %{
-            add-highlighter window/search-highlight dynregex '%reg{/}' 0:rgb:D87C4A+i
-            hook -group search-highlight window NormalKey '<esc>' %{
-                try %{ remove-highlighter window/search-highlight }
+    ## begin public options
+    declare-option -docstring %{
+        Face definition for search highlighting.
+    } str search_highlight_face 0:rgb:D87C4A+i
+    ## end
+
+    # track current highlighting status
+    declare-option -hidden str search_highlight_status 'search-highlight-off'
+    def -hidden -override search-highlight-on nop
+    def -hidden -override search-highlight-off fail
+
+    define-command -hidden search-highlight-enable-impl %{
+        hook -group search-highlight window RegisterModified '/' %{
+            try %{
+                %opt{search_highlight_status}
+            } catch %{
+                add-highlighter window/search-highlight dynregex '%reg{/}' %opt{search_highlight_face}
+                set-option window search_highlight_status 'search-highlight-on'
             }
-        # }
+        }
+        hook -group search-highlight window NormalKey '<esc>' %{
+            try %{
+                %opt{search_highlight_status}
+                remove-highlighter window/search-highlight 
+                set-option window search_highlight_status 'search-highlight-off'
+            }
+        }
     }
-    define-command search-highlight-disable %{
+    define-command -hidden search-highlight-disable-impl %{
         remove-hooks window search-highlight
     }
+    ## begin public commands
+    define-command -docstring %{
+        Enable search highlighting. Press <esc> in normal mode to clear
+        highlighting of the current search.
+
+        Respects the search_highlight_face option.
+    } search-highlight-enable %{
+        search-highlight-enable-impl
+    }
+    define-command -docstring %{
+        Disable search highlighting. Respects the search_highlight_face
+        option.
+    } search-highlight-disable %{
+        search-highlight-disable-impl
+    }
+    ## end
 —
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index f9f2048c..9f0a61a9 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -114,6 +114,8 @@ try %{
 	set-option global ashen_dynamic_cursor true
 	set-option global ashen_eol_cursor true
 }
+
+
 # disable clippy
 set-option -add global ui_options terminal_assistant=none
 
@@ -150,6 +152,8 @@ hook global WinCreate .* %{
 	# and it makes it easy to see trailing spaces
 	add-highlighter window/show-whitespaces show-whitespaces -only-trailing
 	add-highlighter window/show-matching show-matching
+	require-module search-highlight
+	search-highlight-enable
 }
 
 # convenience mappings