diff --git a/rc/extra/editorconfig.kak b/rc/detection/editorconfig.kak similarity index 100% rename from rc/extra/editorconfig.kak rename to rc/detection/editorconfig.kak diff --git a/rc/base/file.kak b/rc/detection/file.kak similarity index 100% rename from rc/base/file.kak rename to rc/detection/file.kak diff --git a/rc/extra/modeline.kak b/rc/detection/modeline.kak similarity index 100% rename from rc/extra/modeline.kak rename to rc/detection/modeline.kak diff --git a/rc/extra/arch-linux.kak b/rc/filetype/arch-linux.kak similarity index 100% rename from rc/extra/arch-linux.kak rename to rc/filetype/arch-linux.kak diff --git a/rc/core/asciidoc.kak b/rc/filetype/asciidoc.kak similarity index 100% rename from rc/core/asciidoc.kak rename to rc/filetype/asciidoc.kak diff --git a/rc/core/c-family.kak b/rc/filetype/c-family.kak similarity index 100% rename from rc/core/c-family.kak rename to rc/filetype/c-family.kak diff --git a/rc/extra/cabal.kak b/rc/filetype/cabal.kak similarity index 100% rename from rc/extra/cabal.kak rename to rc/filetype/cabal.kak diff --git a/rc/base/clojure.kak b/rc/filetype/clojure.kak similarity index 100% rename from rc/base/clojure.kak rename to rc/filetype/clojure.kak diff --git a/rc/extra/cmake.kak b/rc/filetype/cmake.kak similarity index 100% rename from rc/extra/cmake.kak rename to rc/filetype/cmake.kak diff --git a/rc/extra/coffee.kak b/rc/filetype/coffee.kak similarity index 100% rename from rc/extra/coffee.kak rename to rc/filetype/coffee.kak diff --git a/rc/base/css.kak b/rc/filetype/css.kak similarity index 100% rename from rc/base/css.kak rename to rc/filetype/css.kak diff --git a/rc/extra/cucumber.kak b/rc/filetype/cucumber.kak similarity index 100% rename from rc/extra/cucumber.kak rename to rc/filetype/cucumber.kak diff --git a/rc/base/d.kak b/rc/filetype/d.kak similarity index 100% rename from rc/base/d.kak rename to rc/filetype/d.kak diff --git a/rc/extra/dart.kak b/rc/filetype/dart.kak similarity index 100% rename from rc/extra/dart.kak rename to rc/filetype/dart.kak diff --git a/rc/core/diff.kak b/rc/filetype/diff.kak similarity index 100% rename from rc/core/diff.kak rename to rc/filetype/diff.kak diff --git a/rc/extra/dockerfile.kak b/rc/filetype/dockerfile.kak similarity index 100% rename from rc/extra/dockerfile.kak rename to rc/filetype/dockerfile.kak diff --git a/rc/extra/elixir.kak b/rc/filetype/elixir.kak similarity index 100% rename from rc/extra/elixir.kak rename to rc/filetype/elixir.kak diff --git a/rc/extra/elm.kak b/rc/filetype/elm.kak similarity index 100% rename from rc/extra/elm.kak rename to rc/filetype/elm.kak diff --git a/rc/base/etc.kak b/rc/filetype/etc.kak similarity index 100% rename from rc/base/etc.kak rename to rc/filetype/etc.kak diff --git a/rc/extra/exherbo.kak b/rc/filetype/exherbo.kak similarity index 100% rename from rc/extra/exherbo.kak rename to rc/filetype/exherbo.kak diff --git a/rc/base/fish.kak b/rc/filetype/fish.kak similarity index 100% rename from rc/base/fish.kak rename to rc/filetype/fish.kak diff --git a/rc/base/gas.kak b/rc/filetype/gas.kak similarity index 100% rename from rc/base/gas.kak rename to rc/filetype/gas.kak diff --git a/rc/base/git.kak b/rc/filetype/git.kak similarity index 100% rename from rc/base/git.kak rename to rc/filetype/git.kak diff --git a/rc/base/go.kak b/rc/filetype/go.kak similarity index 100% rename from rc/base/go.kak rename to rc/filetype/go.kak diff --git a/rc/extra/haml.kak b/rc/filetype/haml.kak similarity index 100% rename from rc/extra/haml.kak rename to rc/filetype/haml.kak diff --git a/rc/base/haskell.kak b/rc/filetype/haskell.kak similarity index 100% rename from rc/base/haskell.kak rename to rc/filetype/haskell.kak diff --git a/rc/extra/hbs.kak b/rc/filetype/hbs.kak similarity index 100% rename from rc/extra/hbs.kak rename to rc/filetype/hbs.kak diff --git a/rc/base/html.kak b/rc/filetype/html.kak similarity index 100% rename from rc/base/html.kak rename to rc/filetype/html.kak diff --git a/rc/extra/i3.kak b/rc/filetype/i3.kak similarity index 100% rename from rc/extra/i3.kak rename to rc/filetype/i3.kak diff --git a/rc/base/ini.kak b/rc/filetype/ini.kak similarity index 100% rename from rc/base/ini.kak rename to rc/filetype/ini.kak diff --git a/rc/base/java.kak b/rc/filetype/java.kak similarity index 100% rename from rc/base/java.kak rename to rc/filetype/java.kak diff --git a/rc/base/javascript.kak b/rc/filetype/javascript.kak similarity index 100% rename from rc/base/javascript.kak rename to rc/filetype/javascript.kak diff --git a/rc/base/json.kak b/rc/filetype/json.kak similarity index 100% rename from rc/base/json.kak rename to rc/filetype/json.kak diff --git a/rc/base/julia.kak b/rc/filetype/julia.kak similarity index 100% rename from rc/base/julia.kak rename to rc/filetype/julia.kak diff --git a/rc/extra/just.kak b/rc/filetype/just.kak similarity index 100% rename from rc/extra/just.kak rename to rc/filetype/just.kak diff --git a/rc/core/kakrc.kak b/rc/filetype/kakrc.kak similarity index 100% rename from rc/core/kakrc.kak rename to rc/filetype/kakrc.kak diff --git a/rc/extra/kickstart.kak b/rc/filetype/kickstart.kak similarity index 100% rename from rc/extra/kickstart.kak rename to rc/filetype/kickstart.kak diff --git a/rc/extra/latex.kak b/rc/filetype/latex.kak similarity index 100% rename from rc/extra/latex.kak rename to rc/filetype/latex.kak diff --git a/rc/base/lisp.kak b/rc/filetype/lisp.kak similarity index 100% rename from rc/base/lisp.kak rename to rc/filetype/lisp.kak diff --git a/rc/base/lua.kak b/rc/filetype/lua.kak similarity index 100% rename from rc/base/lua.kak rename to rc/filetype/lua.kak diff --git a/rc/base/mail.kak b/rc/filetype/mail.kak similarity index 100% rename from rc/base/mail.kak rename to rc/filetype/mail.kak diff --git a/rc/core/makefile.kak b/rc/filetype/makefile.kak similarity index 100% rename from rc/core/makefile.kak rename to rc/filetype/makefile.kak diff --git a/rc/base/markdown.kak b/rc/filetype/markdown.kak similarity index 100% rename from rc/base/markdown.kak rename to rc/filetype/markdown.kak diff --git a/rc/base/mercurial.kak b/rc/filetype/mercurial.kak similarity index 100% rename from rc/base/mercurial.kak rename to rc/filetype/mercurial.kak diff --git a/rc/extra/moon.kak b/rc/filetype/moon.kak similarity index 100% rename from rc/extra/moon.kak rename to rc/filetype/moon.kak diff --git a/rc/extra/nim.kak b/rc/filetype/nim.kak similarity index 100% rename from rc/extra/nim.kak rename to rc/filetype/nim.kak diff --git a/rc/base/ocaml.kak b/rc/filetype/ocaml.kak similarity index 100% rename from rc/base/ocaml.kak rename to rc/filetype/ocaml.kak diff --git a/rc/base/perl.kak b/rc/filetype/perl.kak similarity index 100% rename from rc/base/perl.kak rename to rc/filetype/perl.kak diff --git a/rc/extra/php.kak b/rc/filetype/php.kak similarity index 100% rename from rc/extra/php.kak rename to rc/filetype/php.kak diff --git a/rc/extra/pony.kak b/rc/filetype/pony.kak similarity index 100% rename from rc/extra/pony.kak rename to rc/filetype/pony.kak diff --git a/rc/extra/protobuf.kak b/rc/filetype/protobuf.kak similarity index 100% rename from rc/extra/protobuf.kak rename to rc/filetype/protobuf.kak diff --git a/rc/extra/pug.kak b/rc/filetype/pug.kak similarity index 100% rename from rc/extra/pug.kak rename to rc/filetype/pug.kak diff --git a/rc/core/python.kak b/rc/filetype/python.kak similarity index 100% rename from rc/core/python.kak rename to rc/filetype/python.kak diff --git a/rc/extra/ragel.kak b/rc/filetype/ragel.kak similarity index 100% rename from rc/extra/ragel.kak rename to rc/filetype/ragel.kak diff --git a/rc/base/restructuredtext.kak b/rc/filetype/restructuredtext.kak similarity index 100% rename from rc/base/restructuredtext.kak rename to rc/filetype/restructuredtext.kak diff --git a/rc/base/ruby.kak b/rc/filetype/ruby.kak similarity index 100% rename from rc/base/ruby.kak rename to rc/filetype/ruby.kak diff --git a/rc/base/rust.kak b/rc/filetype/rust.kak similarity index 100% rename from rc/base/rust.kak rename to rc/filetype/rust.kak diff --git a/rc/extra/sass.kak b/rc/filetype/sass.kak similarity index 100% rename from rc/extra/sass.kak rename to rc/filetype/sass.kak diff --git a/rc/base/scala.kak b/rc/filetype/scala.kak similarity index 100% rename from rc/base/scala.kak rename to rc/filetype/scala.kak diff --git a/rc/extra/scheme.kak b/rc/filetype/scheme.kak similarity index 100% rename from rc/extra/scheme.kak rename to rc/filetype/scheme.kak diff --git a/rc/extra/scss.kak b/rc/filetype/scss.kak similarity index 100% rename from rc/extra/scss.kak rename to rc/filetype/scss.kak diff --git a/rc/core/sh.kak b/rc/filetype/sh.kak similarity index 100% rename from rc/core/sh.kak rename to rc/filetype/sh.kak diff --git a/rc/base/sql.kak b/rc/filetype/sql.kak similarity index 100% rename from rc/base/sql.kak rename to rc/filetype/sql.kak diff --git a/rc/base/swift.kak b/rc/filetype/swift.kak similarity index 100% rename from rc/base/swift.kak rename to rc/filetype/swift.kak diff --git a/rc/extra/systemd.kak b/rc/filetype/systemd.kak similarity index 100% rename from rc/extra/systemd.kak rename to rc/filetype/systemd.kak diff --git a/rc/extra/taskpaper.kak b/rc/filetype/taskpaper.kak similarity index 100% rename from rc/extra/taskpaper.kak rename to rc/filetype/taskpaper.kak diff --git a/rc/extra/toml.kak b/rc/filetype/toml.kak similarity index 100% rename from rc/extra/toml.kak rename to rc/filetype/toml.kak diff --git a/rc/extra/troff.kak b/rc/filetype/troff.kak similarity index 100% rename from rc/extra/troff.kak rename to rc/filetype/troff.kak diff --git a/rc/extra/tupfile.kak b/rc/filetype/tupfile.kak similarity index 100% rename from rc/extra/tupfile.kak rename to rc/filetype/tupfile.kak diff --git a/rc/extra/void-linux.kak b/rc/filetype/void-linux.kak similarity index 100% rename from rc/extra/void-linux.kak rename to rc/filetype/void-linux.kak diff --git a/rc/base/yaml.kak b/rc/filetype/yaml.kak similarity index 100% rename from rc/base/yaml.kak rename to rc/filetype/yaml.kak diff --git a/rc/extra/autorestore.kak b/rc/tools/autorestore.kak similarity index 100% rename from rc/extra/autorestore.kak rename to rc/tools/autorestore.kak diff --git a/rc/base/autowrap.kak b/rc/tools/autowrap.kak similarity index 100% rename from rc/base/autowrap.kak rename to rc/tools/autowrap.kak diff --git a/rc/extra/clang.kak b/rc/tools/clang.kak similarity index 100% rename from rc/extra/clang.kak rename to rc/tools/clang.kak diff --git a/rc/core/comment.kak b/rc/tools/comment.kak similarity index 100% rename from rc/core/comment.kak rename to rc/tools/comment.kak diff --git a/rc/base/ctags.kak b/rc/tools/ctags.kak similarity index 100% rename from rc/base/ctags.kak rename to rc/tools/ctags.kak diff --git a/rc/core/doc.kak b/rc/tools/doc.kak similarity index 100% rename from rc/core/doc.kak rename to rc/tools/doc.kak diff --git a/rc/core/formatter.kak b/rc/tools/formatter.kak similarity index 100% rename from rc/core/formatter.kak rename to rc/tools/formatter.kak diff --git a/rc/extra/git-tools.kak b/rc/tools/git.kak similarity index 100% rename from rc/extra/git-tools.kak rename to rc/tools/git.kak diff --git a/rc/extra/go-tools.kak b/rc/tools/go/go-tools.kak similarity index 100% rename from rc/extra/go-tools.kak rename to rc/tools/go/go-tools.kak diff --git a/rc/core/grep.kak b/rc/tools/grep.kak similarity index 100% rename from rc/core/grep.kak rename to rc/tools/grep.kak diff --git a/rc/base/lint.kak b/rc/tools/lint.kak similarity index 100% rename from rc/base/lint.kak rename to rc/tools/lint.kak diff --git a/rc/core/make.kak b/rc/tools/make.kak similarity index 100% rename from rc/core/make.kak rename to rc/tools/make.kak diff --git a/rc/core/man.kak b/rc/tools/man.kak similarity index 100% rename from rc/core/man.kak rename to rc/tools/man.kak diff --git a/rc/extra/jedi.kak b/rc/tools/python/jedi.kak similarity index 100% rename from rc/extra/jedi.kak rename to rc/tools/python/jedi.kak diff --git a/rc/extra/ranger.kak b/rc/tools/ranger.kak similarity index 100% rename from rc/extra/ranger.kak rename to rc/tools/ranger.kak diff --git a/rc/extra/racer.kak b/rc/tools/rust/racer.kak similarity index 100% rename from rc/extra/racer.kak rename to rc/tools/rust/racer.kak diff --git a/rc/base/spell.kak b/rc/tools/spell.kak similarity index 100% rename from rc/base/spell.kak rename to rc/tools/spell.kak diff --git a/rc/extra/iterm.kak b/rc/windowing/iterm.kak similarity index 100% rename from rc/extra/iterm.kak rename to rc/windowing/iterm.kak diff --git a/rc/extra/kitty.kak b/rc/windowing/kitty.kak similarity index 100% rename from rc/extra/kitty.kak rename to rc/windowing/kitty.kak diff --git a/rc/base/new-client.kak b/rc/windowing/new-client.kak similarity index 100% rename from rc/base/new-client.kak rename to rc/windowing/new-client.kak diff --git a/rc/base/screen.kak b/rc/windowing/screen.kak similarity index 100% rename from rc/base/screen.kak rename to rc/windowing/screen.kak diff --git a/rc/base/tmux.kak b/rc/windowing/tmux.kak similarity index 100% rename from rc/base/tmux.kak rename to rc/windowing/tmux.kak diff --git a/rc/extra/tmux-repl.kak b/rc/windowing/tmux/repl.kak similarity index 100% rename from rc/extra/tmux-repl.kak rename to rc/windowing/tmux/repl.kak diff --git a/rc/base/x11.kak b/rc/windowing/x11.kak similarity index 100% rename from rc/base/x11.kak rename to rc/windowing/x11.kak diff --git a/rc/extra/x11-repl.kak b/rc/windowing/x11/repl.kak similarity index 100% rename from rc/extra/x11-repl.kak rename to rc/windowing/x11/repl.kak diff --git a/test/indent/c-family/align-while-expr/rc b/test/indent/c-family/align-while-expr/rc index 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 4808655dc4..f9dc592b99 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 4808655dc4..f9dc592b99 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 4808655dc4..f9dc592b99 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 4808655dc4..f9dc592b99 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 7e506fc438..3f756817b0 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 7e506fc438..3f756817b0 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 7e506fc438..3f756817b0 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 5756ea1a46..ef3301f705 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 7550d15cff..b5cf999de3 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 7b9ff85ed1..59ce786214 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 d4fadeea00..934f7e8321 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 d4fadeea00..934f7e8321 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 d4fadeea00..934f7e8321 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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 3daaec2e99..367014a11d 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 7550d15cff..b5cf999de3 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 909f53ff26..a098fc21b1 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 5756ea1a46..ef3301f705 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 909f53ff26..a098fc21b1 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 53c40654ec..2c2a7247df 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 53c40654ec..2c2a7247df 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