Add categories in rc/

Closes #2783

43 files changed, 47 insertions, 47 deletions

diff --git a/test/indent/c-family/align-while-expr/rc b/test/indent/c-family/align-while-expr/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/align-while-expr/rc
+++ b/test/indent/c-family/align-while-expr/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/close-namespace/rc b/test/indent/c-family/close-namespace/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/close-namespace/rc
+++ b/test/indent/c-family/close-namespace/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/close-struct/rc b/test/indent/c-family/close-struct/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/close-struct/rc
+++ b/test/indent/c-family/close-struct/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/comment-line-continuation/rc b/test/indent/c-family/comment-line-continuation/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/comment-line-continuation/rc
+++ b/test/indent/c-family/comment-line-continuation/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/construct-align/rc b/test/indent/c-family/construct-align/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/construct-align/rc
+++ b/test/indent/c-family/construct-align/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/deindent-if-body/rc b/test/indent/c-family/deindent-if-body/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/deindent-if-body/rc
+++ b/test/indent/c-family/deindent-if-body/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/indent-after-parenthesis/rc b/test/indent/c-family/indent-after-parenthesis/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/indent-after-parenthesis/rc
+++ b/test/indent/c-family/indent-after-parenthesis/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/indent-if-body/rc b/test/indent/c-family/indent-if-body/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/indent-if-body/rc
+++ b/test/indent/c-family/indent-if-body/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/indent-if-brace/rc b/test/indent/c-family/indent-if-brace/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/indent-if-brace/rc
+++ b/test/indent/c-family/indent-if-brace/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/move-brace/rc b/test/indent/c-family/move-brace/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/move-brace/rc
+++ b/test/indent/c-family/move-brace/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/multiline-nested-align/rc b/test/indent/c-family/multiline-nested-align/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/multiline-nested-align/rc
+++ b/test/indent/c-family/multiline-nested-align/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/nested-align/rc b/test/indent/c-family/nested-align/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/nested-align/rc
+++ b/test/indent/c-family/nested-align/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/c-family/open-function/rc b/test/indent/c-family/open-function/rc
index 53c40654..2c2a7247 100644
--- a/test/indent/c-family/open-function/rc
+++ b/test/indent/c-family/open-function/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/indent/comment/comment-multiple-lines-indented/rc b/test/indent/comment/comment-multiple-lines-indented/rc
index 4808655d..f9dc592b 100644
--- a/test/indent/comment/comment-multiple-lines-indented/rc
+++ b/test/indent/comment/comment-multiple-lines-indented/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/comment/comment-multiple-lines-unindented/rc b/test/indent/comment/comment-multiple-lines-unindented/rc
index 4808655d..f9dc592b 100644
--- a/test/indent/comment/comment-multiple-lines-unindented/rc
+++ b/test/indent/comment/comment-multiple-lines-unindented/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/comment/comment-multiple-lines-when-partially-commented/rc b/test/indent/comment/comment-multiple-lines-when-partially-commented/rc
index 4808655d..f9dc592b 100644
--- a/test/indent/comment/comment-multiple-lines-when-partially-commented/rc
+++ b/test/indent/comment/comment-multiple-lines-when-partially-commented/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/comment/uncomment-multiple-indented-lines/rc b/test/indent/comment/uncomment-multiple-indented-lines/rc
index 4808655d..f9dc592b 100644
--- a/test/indent/comment/uncomment-multiple-indented-lines/rc
+++ b/test/indent/comment/uncomment-multiple-indented-lines/rc
@@ -1,4 +1,4 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/yaml.kak"
-source "%val{runtime}/rc/core/comment.kak"
+source "%val{runtime}/rc/filetype/yaml.kak"
+source "%val{runtime}/rc/tools/comment.kak"
 set buffer filetype yaml
diff --git a/test/indent/haskell/before-comment/rc b/test/indent/haskell/before-comment/rc
index 7e506fc4..3f756817 100644
--- a/test/indent/haskell/before-comment/rc
+++ b/test/indent/haskell/before-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/haskell.kak"
+source "%val{runtime}/rc/filetype/haskell.kak"
 set buffer filetype haskell
diff --git a/test/indent/haskell/indented-comment/rc b/test/indent/haskell/indented-comment/rc
index 7e506fc4..3f756817 100644
--- a/test/indent/haskell/indented-comment/rc
+++ b/test/indent/haskell/indented-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/haskell.kak"
+source "%val{runtime}/rc/filetype/haskell.kak"
 set buffer filetype haskell
diff --git a/test/indent/haskell/inside-comment/rc b/test/indent/haskell/inside-comment/rc
index 7e506fc4..3f756817 100644
--- a/test/indent/haskell/inside-comment/rc
+++ b/test/indent/haskell/inside-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/haskell.kak"
+source "%val{runtime}/rc/filetype/haskell.kak"
 set buffer filetype haskell
diff --git a/test/indent/html/indent-closing-tag/rc b/test/indent/html/indent-closing-tag/rc
index 5756ea1a..ef3301f7 100644
--- a/test/indent/html/indent-closing-tag/rc
+++ b/test/indent/html/indent-closing-tag/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/html.kak"
+source "%val{runtime}/rc/filetype/html.kak"
 set buffer filetype html
diff --git a/test/indent/lua/insert-end-only-when-needed/rc b/test/indent/lua/insert-end-only-when-needed/rc
index 7550d15c..b5cf999d 100644
--- a/test/indent/lua/insert-end-only-when-needed/rc
+++ b/test/indent/lua/insert-end-only-when-needed/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/lua.kak"
+source "%val{runtime}/rc/filetype/lua.kak"
 set buffer filetype lua
diff --git a/test/indent/markdown/inside-complex-blockquote/rc b/test/indent/markdown/inside-complex-blockquote/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/inside-complex-blockquote/rc
+++ b/test/indent/markdown/inside-complex-blockquote/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-list-item/rc b/test/indent/markdown/inside-list-item/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/inside-list-item/rc
+++ b/test/indent/markdown/inside-list-item/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-nested-list-item/rc b/test/indent/markdown/inside-nested-list-item/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/inside-nested-list-item/rc
+++ b/test/indent/markdown/inside-nested-list-item/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-simple-blockquote/rc b/test/indent/markdown/inside-simple-blockquote/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/inside-simple-blockquote/rc
+++ b/test/indent/markdown/inside-simple-blockquote/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/inside-strong-emphasis/rc b/test/indent/markdown/inside-strong-emphasis/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/inside-strong-emphasis/rc
+++ b/test/indent/markdown/inside-strong-emphasis/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/list-item/rc b/test/indent/markdown/list-item/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/list-item/rc
+++ b/test/indent/markdown/list-item/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/open-after-setext-heading-1/rc b/test/indent/markdown/open-after-setext-heading-1/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/open-after-setext-heading-1/rc
+++ b/test/indent/markdown/open-after-setext-heading-1/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/markdown/open-after-setext-heading-2/rc b/test/indent/markdown/open-after-setext-heading-2/rc
index 7b9ff85e..59ce7862 100644
--- a/test/indent/markdown/open-after-setext-heading-2/rc
+++ b/test/indent/markdown/open-after-setext-heading-2/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/markdown.kak"
+source "%val{runtime}/rc/filetype/markdown.kak"
 set buffer filetype markdown
diff --git a/test/indent/ruby/following-blocks-should-not-prevent-end/rc b/test/indent/ruby/following-blocks-should-not-prevent-end/rc
index d4fadeea..934f7e83 100644
--- a/test/indent/ruby/following-blocks-should-not-prevent-end/rc
+++ b/test/indent/ruby/following-blocks-should-not-prevent-end/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/ruby.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
 set buffer filetype ruby
diff --git a/test/indent/ruby/indent-after-class/rc b/test/indent/ruby/indent-after-class/rc
index d4fadeea..934f7e83 100644
--- a/test/indent/ruby/indent-after-class/rc
+++ b/test/indent/ruby/indent-after-class/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/ruby.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
 set buffer filetype ruby
diff --git a/test/indent/ruby/method-definition-shouldnt-duplicate/rc b/test/indent/ruby/method-definition-shouldnt-duplicate/rc
index d4fadeea..934f7e83 100644
--- a/test/indent/ruby/method-definition-shouldnt-duplicate/rc
+++ b/test/indent/ruby/method-definition-shouldnt-duplicate/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/ruby.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
 set buffer filetype ruby
diff --git a/test/regression/1074-comment-leader-autoinsert-error/rc b/test/regression/1074-comment-leader-autoinsert-error/rc
index 53c40654..2c2a7247 100644
--- a/test/regression/1074-comment-leader-autoinsert-error/rc
+++ b/test/regression/1074-comment-leader-autoinsert-error/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/1111-unexpected-behaviour-on-new-line-in-comment/rc b/test/regression/1111-unexpected-behaviour-on-new-line-in-comment/rc
index 53c40654..2c2a7247 100644
--- a/test/regression/1111-unexpected-behaviour-on-new-line-in-comment/rc
+++ b/test/regression/1111-unexpected-behaviour-on-new-line-in-comment/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/1118-misaligned-comment-start/rc b/test/regression/1118-misaligned-comment-start/rc
index 53c40654..2c2a7247 100644
--- a/test/regression/1118-misaligned-comment-start/rc
+++ b/test/regression/1118-misaligned-comment-start/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/rc b/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/rc
index 3daaec2e..367014a1 100644
--- a/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/rc
+++ b/test/regression/1308-wrong-behaviour-of-kak-indent-on-newline/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/kakrc.kak"
+source "%val{runtime}/rc/filetype/kakrc.kak"
 set buffer filetype kak
diff --git a/test/regression/1525-lua-indent-error/rc b/test/regression/1525-lua-indent-error/rc
index 7550d15c..b5cf999d 100644
--- a/test/regression/1525-lua-indent-error/rc
+++ b/test/regression/1525-lua-indent-error/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/lua.kak"
+source "%val{runtime}/rc/filetype/lua.kak"
 set buffer filetype lua
diff --git a/test/regression/1920-crash-on-python-in-docstring/rc b/test/regression/1920-crash-on-python-in-docstring/rc
index 909f53ff..a098fc21 100644
--- a/test/regression/1920-crash-on-python-in-docstring/rc
+++ b/test/regression/1920-crash-on-python-in-docstring/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/python.kak"
+source "%val{runtime}/rc/filetype/python.kak"
 set buffer filetype python
diff --git a/test/regression/2499-html-regions-assert/rc b/test/regression/2499-html-regions-assert/rc
index 5756ea1a..ef3301f7 100644
--- a/test/regression/2499-html-regions-assert/rc
+++ b/test/regression/2499-html-regions-assert/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/base/html.kak"
+source "%val{runtime}/rc/filetype/html.kak"
 set buffer filetype html
diff --git a/test/regression/860-python-incorrect-commenting/rc b/test/regression/860-python-incorrect-commenting/rc
index 909f53ff..a098fc21 100644
--- a/test/regression/860-python-incorrect-commenting/rc
+++ b/test/regression/860-python-incorrect-commenting/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/python.kak"
+source "%val{runtime}/rc/filetype/python.kak"
 set buffer filetype python
diff --git a/test/regression/872-indentation-misbeahviour-c++/rc b/test/regression/872-indentation-misbeahviour-c++/rc
index 53c40654..2c2a7247 100644
--- a/test/regression/872-indentation-misbeahviour-c++/rc
+++ b/test/regression/872-indentation-misbeahviour-c++/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp
diff --git a/test/regression/918-wrong-asterisk-inserted/rc b/test/regression/918-wrong-asterisk-inserted/rc
index 53c40654..2c2a7247 100644
--- a/test/regression/918-wrong-asterisk-inserted/rc
+++ b/test/regression/918-wrong-asterisk-inserted/rc
@@ -1,3 +1,3 @@
 source "%val{runtime}/colors/default.kak"
-source "%val{runtime}/rc/core/c-family.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
 set buffer filetype cpp