Fixed many of the filetype support modules to not use `BufSetOption` to load

1 files changed, 15 insertions, 17 deletions

diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
index e2759129..8ee1d8ce 100644
--- a/rc/filetype/php.kak
+++ b/rc/filetype/php.kak
@@ -5,8 +5,22 @@ hook global BufCreate .*[.](php) %{
     set-option buffer filetype php
 }
 
-hook -once global BufSetOption filetype=php %{
+# Initialization
+# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
+
+hook global WinSetOption filetype=php %{
     require-module php
+
+    hook window ModeChange insert:.* -group php-trim-indent  php-trim-indent
+    hook window InsertChar .* -group php-indent php-indent-on-char
+    hook window InsertChar \n -group php-indent php-indent-on-new-line
+
+    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window php-.+ }
+}
+
+hook -group php-highlight global WinSetOption filetype=php %{
+    add-highlighter window/php-file ref php-file
+    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/php-file }
 }
 
 provide-module php %(
@@ -80,20 +94,4 @@ define-command -hidden php-indent-on-new-line %<
     >
 >
 
-# Initialization
-# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-
-hook -group php-highlight global WinSetOption filetype=php %{
-    add-highlighter window/php-file ref php-file
-    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/php-file }
-}
-
-hook global WinSetOption filetype=php %{
-    hook window ModeChange insert:.* -group php-trim-indent  php-trim-indent
-    hook window InsertChar .* -group php-indent php-indent-on-char
-    hook window InsertChar \n -group php-indent php-indent-on-new-line
-
-    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window php-.+ }
-}
-
 )