Merge branch 'master' into slim-vim

.pre-commit-config.yaml

@@ -10,3 +10,7 @@ repos:
     rev: pre-commit-support
     hooks:
       - id: vint
+        exclude: >
+          (?x)^(
+            vim/colors/.*\.vim
+          )$

vim/after/indent/java.vim

@@ -2,7 +2,7 @@ function! GetJavaIndent_improved()
     let theIndent = GetJavaIndent()
     let lnum = prevnonblank(v:lnum - 1)
     let line = getline(lnum)
-    if line =~ '^\s*@.*$'
+    if line =~? '^\s*@.*$'
         let theIndent = indent(lnum)
     endif