Fixed several more support files.

1 files changed, 15 insertions, 16 deletions

diff --git a/rc/filetype/fish.kak b/rc/filetype/fish.kak
index db62a354..49d0c9f8 100644
--- a/rc/filetype/fish.kak
+++ b/rc/filetype/fish.kak
@@ -8,10 +8,24 @@ hook global BufCreate .*[.](fish) %{
     set-option buffer filetype fish
 }
 
-hook -once global BufSetOption filetype=fish %{
+# Initialization
+# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
+
+hook global WinSetOption filetype=fish %{
     require-module fish
+
+    hook window InsertChar .* -group fish-indent fish-indent-on-char
+    hook window InsertChar \n -group fish-indent fish-indent-on-new-line
+
+    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window fish-.+ }
 }
 
+hook -group fish-highlight global WinSetOption filetype=fish %{
+    add-highlighter window/fish ref fish
+    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/fish }
+}
+
+
 provide-module fish %{
 
 # Highlighters
@@ -63,19 +77,4 @@ define-command -hidden fish-indent-on-new-line %{
     }
 }
 
-# Initialization
-# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-
-hook -group fish-highlight global WinSetOption filetype=fish %{
-    add-highlighter window/fish ref fish
-    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/fish }
-}
-
-hook global WinSetOption filetype=fish %{
-    hook window InsertChar .* -group fish-indent fish-indent-on-char
-    hook window InsertChar \n -group fish-indent fish-indent-on-new-line
-
-    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window fish-.+ }
-}
-
 }