Merge branch 'master' into debug

1 files changed, 10 insertions, 1 deletions

diff --git a/languages.toml b/languages.toml
index 050f1b4f..56d91a81 100644
--- a/languages.toml
+++ b/languages.toml
@@ -312,7 +312,7 @@ injection-regex = "php"
 file-types = ["php"]
 roots = []
 
-indent = { tab-width = 2, unit = "  " }
+indent = { tab-width = 4, unit = "    " }
 
 [[language]]
 name = "latex"
@@ -458,3 +458,12 @@ file-types = ["scm"]
 roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
+
+[[language]]
+name = "cmake"
+scope = "source.cmake"
+file-types = ["cmake", "CMakeLists.txt"]
+roots = []
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "cmake-language-server" }