Merge remote-tracking branch 'Delapouite/remove-hooks'

rc/base/clojure.kak

@@ -170,6 +170,5 @@ hook global WinSetOption filetype=clojure %[
 hook -group clojure-highlight global WinSetOption filetype=(?!clojure).* %{ remove-highlighter window/clojure }
 
 hook global WinSetOption filetype=(?!clojure).* %{
-    remove-hooks window clojure-indent
+    remove-hooks window clojure-.+
-    remove-hooks window clojure-hooks
 }

rc/base/css.kak

@@ -73,6 +73,5 @@ hook global WinSetOption filetype=css %[
 hook -group css-highlight global WinSetOption filetype=(?!css).* %{ remove-highlighter window/css }
 
 hook global WinSetOption filetype=(?!css).* %{
-    remove-hooks window css-indent
+    remove-hooks window css-.+
-    remove-hooks window css-hooks
 }

rc/base/d.kak

@@ -129,6 +129,5 @@ hook global WinSetOption filetype=d %{
 hook -group d-highlight global WinSetOption filetype=(?!d).* %{ remove-highlighter window/d }
 
 hook global WinSetOption filetype=(?!d).* %{
-    remove-hooks window d-hooks
+    remove-hooks window d-.+
-    remove-hooks window d-indent
 }

rc/base/fish.kak

@@ -81,6 +81,5 @@ hook global WinSetOption filetype=fish %{
 hook -group fish-highlight global WinSetOption filetype=(?!fish).* %{ remove-highlighter window/fish }
 
 hook global WinSetOption filetype=(?!fish).* %{
-    remove-hooks window fish-indent
+    remove-hooks window fish-.+
-    remove-hooks window fish-insert
 }

rc/base/go.kak

@@ -94,6 +94,5 @@ hook global WinSetOption filetype=go %{
 hook -group go-highlight global WinSetOption filetype=(?!go).* %{ remove-highlighter window/go }
 
 hook global WinSetOption filetype=(?!go).* %{
-    remove-hooks window go-hooks
+    remove-hooks window go-.+
-    remove-hooks window go-indent
 }

rc/base/haskell.kak

@@ -102,6 +102,5 @@ hook global WinSetOption filetype=haskell %{
 hook -group haskell-highlight global WinSetOption filetype=(?!haskell).* %{ remove-highlighter window/haskell }
 
 hook global WinSetOption filetype=(?!haskell).* %{
-    remove-hooks window haskell-indent
+    remove-hooks window haskell-.+
-    remove-hooks window haskell-hooks
 }

rc/base/html.kak

@@ -69,6 +69,5 @@ hook global WinSetOption filetype=(?:html|xml) %{
 hook -group html-highlight global WinSetOption filetype=(?!html)(?!xml).* %{ remove-highlighter window/html }
 
 hook global WinSetOption filetype=(?!html)(?!xml).* %{
-    remove-hooks window html-indent
+    remove-hooks window html-.+
-    remove-hooks window html-hooks
 }

rc/base/java.kak

@@ -57,8 +57,7 @@ hook global WinSetOption filetype=java %{
 }
 
 hook global WinSetOption filetype=(?!java).* %{
-    remove-hooks window java-hooks
+    remove-hooks window java-.+
-    remove-hooks window java-indent
 }
 hook -group java-highlight global WinSetOption filetype=java %{ add-highlighter window/java ref java }
 hook -group java-highlight global WinSetOption filetype=(?!java).* %{ remove-highlighter window/java }

rc/base/json.kak

@@ -57,6 +57,5 @@ hook global WinSetOption filetype=json %{
 hook -group json-highlight global WinSetOption filetype=(?!json).* %{ remove-highlighter window/json }
 
 hook global WinSetOption filetype=(?!json).* %{
-    remove-hooks window json-indent
+    remove-hooks window json-.+
-    remove-hooks window json-hooks
 }

rc/base/lisp.kak

@@ -53,6 +53,5 @@ hook global WinSetOption filetype=lisp %{
 hook -group lisp-highlight global WinSetOption filetype=(?!lisp).* %{ remove-highlighter window/lisp }
 
 hook global WinSetOption filetype=(?!lisp).* %{
-    remove-hooks window lisp-indent
+    remove-hooks window lisp-.+
-    remove-hooks window lisp-hooks
 }

rc/base/lua.kak

@@ -97,8 +97,7 @@ hook global WinSetOption filetype=lua %{
 hook -group lua-highlight global WinSetOption filetype=(?!lua).* %{ remove-highlighter window/lua }
 
 hook global WinSetOption filetype=(?!lua).* %{
-    remove-hooks window lua-indent
+    remove-hooks window lua-.+
-    remove-hooks window lua-insert
 
     unalias window alt lua-alternative-file
 }

rc/base/perl.kak

@@ -111,6 +111,5 @@ hook global WinSetOption filetype=perl %{
 hook -group perl-highlight global WinSetOption filetype=(?!perl).* %{ remove-highlighter window/perl }
 
 hook global WinSetOption filetype=(?!perl).* %{
-    remove-hooks window perl-hooks
+    remove-hooks window perl-.+
-    remove-hooks window perl-indent
 }

rc/base/ruby.kak

@@ -157,8 +157,7 @@ hook global WinSetOption filetype=ruby %{
 hook -group ruby-highlight global WinSetOption filetype=(?!ruby).* %{ remove-highlighter window/ruby }
 
 hook global WinSetOption filetype=(?!ruby).* %{
-    remove-hooks window ruby-indent
+    remove-hooks window ruby-.+
-    remove-hooks window ruby-insert
 
     unalias window alt ruby-alternative-file
 }

rc/base/rust.kak

@@ -86,6 +86,5 @@ hook global WinSetOption filetype=rust %[
 hook -group rust-highlight global WinSetOption filetype=(?!rust).* %{ remove-highlighter window/rust }
 
 hook global WinSetOption filetype=(?!rust).* %{
-    remove-hooks window rust-indent
+    remove-hooks window rust-.+
-    remove-hooks window rust-hooks
 }

rc/base/scala.kak

@@ -72,6 +72,5 @@ hook global WinSetOption filetype=scala %[
 hook -group scala-highlight global WinSetOption filetype=(?!scala).* %{ remove-highlighter window/scala }
 
 hook global WinSetOption filetype=(?!scala).* %{
-    remove-hooks window scala-indent
+    remove-hooks window scala-.+
-    remove-hooks window scala-hooks
 }

rc/base/yaml.kak

@@ -56,6 +56,5 @@ hook global WinSetOption filetype=yaml %{
 hook -group yaml-highlight global WinSetOption filetype=(?!yaml).* %{ remove-highlighter window/yaml }
 
 hook global WinSetOption filetype=(?!yaml).* %{
-    remove-hooks window yaml-indent
+    remove-hooks window yaml-.+
-    remove-hooks window yaml-hooks
 }

rc/core/c-family.kak

@@ -276,9 +276,7 @@ evaluate-commands %sh{
 
 hook global WinSetOption filetype=(c|cpp|objc) %[
     try %{ # we might be switching from one c-family language to another
-        remove-hooks window c-family-hooks
+        remove-hooks window c-family-.+
-        remove-hooks window c-family-indent
-        remove-hooks window c-family-insert
     }
 
     hook -group c-family-indent window ModeChange insert:.* c-family-trim-autoindent
@@ -292,9 +290,7 @@ hook global WinSetOption filetype=(c|cpp|objc) %[
 ]
 
 hook global WinSetOption filetype=(?!c)(?!cpp)(?!objc).* %[
-    remove-hooks window c-family-hooks
+    remove-hooks window c-family-.+
-    remove-hooks window c-family-indent
-    remove-hooks window c-family-insert
 
     unalias window alt c-family-alternative-file
 ]

rc/extra/cabal.kak

@@ -70,6 +70,5 @@ hook global WinSetOption filetype=cabal %[
 hook -group cabal-highlight global WinSetOption filetype=(?!cabal).* %{ remove-highlighter window/cabal }
 
 hook global WinSetOption filetype=(?!cabal).* %{
-    remove-hooks window cabal-indent
+    remove-hooks window cabal-.+
-    remove-hooks window cabal-hooks
 }

rc/extra/coffee.kak

@@ -76,6 +76,5 @@ hook global WinSetOption filetype=coffee %{
 hook -group coffee-highlight global WinSetOption filetype=(?!coffee).* %{ remove-highlighter window/coffee }
 
 hook global WinSetOption filetype=(?!coffee).* %{
-    remove-hooks window coffee-indent
+    remove-hooks window coffee-.+
-    remove-hooks window coffee-hooks
 }

rc/extra/cucumber.kak

@@ -86,6 +86,5 @@ hook global WinSetOption filetype=cucumber %{
 hook -group cucumber-highlight global WinSetOption filetype=(?!cucumber).* %{ remove-highlighter window/cucumber }
 
 hook global WinSetOption filetype=(?!cucumber).* %{
-    remove-hooks window cucumber-indent
+    remove-hooks window cucumber-.+
-    remove-hooks window cucumber-hooks
 }

rc/extra/dart.kak

@@ -103,6 +103,5 @@ hook global WinSetOption filetype=dart %{
 hook -group dart-highlight global WinSetOption filetype=(?!dart).* %{ remove-highlighter window/dart }
 
 hook global WinSetOption filetype=(?!dart).* %{
-    remove-hooks window dart-hooks
+    remove-hooks window dart-.+
-    remove-hooks window dart-indent
 }

rc/extra/elm.kak

@@ -64,6 +64,5 @@ hook global WinSetOption filetype=elm %{
 hook -group elm-highlight global WinSetOption filetype=(?!elm).* %{ remove-highlighter window/elm }
 
 hook global WinSetOption filetype=(?!elm).* %{
-    remove-hooks window elm-indent
+    remove-hooks window elm-.+
-    remove-hooks window elm-hooks
 }

rc/extra/haml.kak

@@ -59,6 +59,5 @@ hook global WinSetOption filetype=haml %{
 hook -group haml-highlight global WinSetOption filetype=(?!haml).* %{ remove-highlighter window/haml }
 
 hook global WinSetOption filetype=(?!haml).* %{
-    remove-hooks window haml-indent
+    remove-hooks window haml-.+
-    remove-hooks window haml-hooks
 }

rc/extra/hbs.kak

@@ -68,6 +68,5 @@ hook -group hbs-highlight global WinSetOption filetype=(?!hbs).* %{
 }
 
 hook global WinSetOption filetype=(?!hbs).* %{
-    remove-hooks window hbs-indent
+    remove-hooks window hbs-.+
-    remove-hooks window hbs-hooks
 }

rc/extra/i3.kak

@@ -78,6 +78,5 @@ hook global WinSetOption filetype=i3 %[
 hook -group i3-highlight global WinSetOption filetype=(?!i3).* %{ remove-highlighter window/i3 }
 
 hook global WinSetOption filetype=(?!i3).* %{
-    remove-hooks window i3-hooks
+    remove-hooks window i3-.+
-    remove-hooks window i3-indent
 }

rc/extra/moon.kak

@@ -101,8 +101,7 @@ hook global WinSetOption filetype=moon %{
 hook -group moon-highlight global WinSetOption filetype=(?!moon).* %{ remove-highlighter window/moon }
 
 hook global WinSetOption filetype=(?!moon).* %{
-    remove-hooks window moon-indent
+    remove-hooks window moon-.+
-    remove-hooks window moon-hooks
 
     unalias window alt moon-alternative-file
 }

rc/extra/php.kak

@@ -87,6 +87,5 @@ hook global WinSetOption filetype=php %{
 hook -group php-highlight global WinSetOption filetype=(?!php).* %{ remove-highlighter window/php-file }
 
 hook global WinSetOption filetype=(?!php).* %{
-    remove-hooks window php-indent
+    remove-hooks window php-.+
-    remove-hooks window php-hooks
 }

rc/extra/protobuf.kak

@@ -82,6 +82,5 @@ hook global WinSetOption filetype=protobuf %[
 hook -group protobuf-highlight global WinSetOption filetype=(?!protobuf).* %{ remove-highlighter window/protobuf }
 
 hook global WinSetOption filetype=(?!protobuf).* %{
-    remove-hooks window protobuf-hooks
+    remove-hooks window protobuf-.+
-    remove-hooks window protobuf-indent
 }

rc/extra/pug.kak

@@ -71,6 +71,5 @@ hook global WinSetOption filetype=pug %{
 hook -group pug-highlight global WinSetOption filetype=(?!pug).* %{ remove-highlighter window/pug }
 
 hook global WinSetOption filetype=(?!pug).* %{
-    remove-hooks window pug-indent
+    remove-hooks window pug-.+
-    remove-hooks window pug-hooks
 }

rc/extra/ragel.kak

@@ -67,6 +67,5 @@ hook global WinSetOption filetype=ragel %{
 hook -group ragel-highlight global WinSetOption filetype=(?!ragel).* %{ remove-highlighter window/ragel }
 
 hook global WinSetOption filetype=(?!ragel).* %{
-    remove-hooks window ragel-indent
+    remove-hooks window ragel-.+
-    remove-hooks window ragel-hooks
 }

rc/extra/sass.kak

@@ -59,6 +59,5 @@ hook global WinSetOption filetype=sass %{
 hook -group sass-highlight global WinSetOption filetype=(?!sass).* %{ remove-highlighter window/sass }
 
 hook global WinSetOption filetype=(?!sass).* %{
-    remove-hooks window sass-indent
+    remove-hooks window sass-.+
-    remove-hooks window sass-hooks
 }

rc/extra/scheme.kak

@@ -127,6 +127,5 @@ hook global WinSetOption filetype=scheme %{
 }
 
 hook global WinSetOption filetype=(?!scheme).* %{
-    remove-hooks window scheme-indent
+    remove-hooks window scheme-.+
-    remove-hooks window scheme-hooks
 }

rc/extra/scss.kak

@@ -42,6 +42,5 @@ hook global WinSetOption filetype=scss %[
 hook -group scss-highlight global WinSetOption filetype=(?!scss).* %{ remove-highlighter window/scss }
 
 hook global WinSetOption filetype=(?!scss).* %{
-    remove-hooks window scss-indent
+    remove-hooks window scss-.+
-    remove-hooks window scss-hooks
 }

rc/extra/toml.kak

@@ -64,7 +64,6 @@ hook -group toml-highlight global WinSetOption filetype=(?!toml).* %{
 }
 
 hook global WinSetOption filetype=(?!toml).* %{
-    remove-hooks window toml-indent
+    remove-hooks window toml-.+
-    remove-hooks window toml-hooks
 }