diff options
| author | Marwin Glaser <marwin_g@icloud.com> | 2022-10-19 15:39:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-19 15:39:49 +0100 |
| commit | 3c708c43908ba44f075bbaa7daf584c6b46d9723 (patch) | |
| tree | 1333e6883f64ce16da6f08126147063cb3a7a5a9 | |
| parent | df63f05c3a81f726ee9fbfc4954eb675e287c7f7 (diff) | |
patch 9.0.0798: clang format configuration files are not recognizedv9.0.0798
Problem: Clang format configuration files are not recognized.
Solution: Use yaml for Clang format configuration files. (Marwin Glaser,
closes #11398)
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 2b473300fc..b802efa2b9 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -369,6 +369,9 @@ au BufNewFile,BufRead *.ch call dist#ft#FTchange() " ChordPro au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro setf chordpro +" Clang-format +au BufNewFile,BufRead .clang-format setf yaml + " Clang-tidy au BufNewFile,BufRead .clang-tidy setf yaml diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 32c14ae66c..c6bacfbf71 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -641,7 +641,7 @@ let s:filename_checks = { \ 'xsd': ['file.xsd'], \ 'xslt': ['file.xsl', 'file.xslt'], \ 'yacc': ['file.yy', 'file.yxx', 'file.y++'], - \ 'yaml': ['file.yaml', 'file.yml', '.clang-tidy'], + \ 'yaml': ['file.yaml', 'file.yml', '.clang-format', '.clang-tidy'], \ 'yang': ['file.yang'], \ 'z8a': ['file.z8a'], \ 'zig': ['file.zig'], diff --git a/src/version.c b/src/version.c index bf4994622b..e612e53661 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 798, +/**/ 797, /**/ 796, |