patch 9.0.0814: aws config files are not recognized

Problem:    Aws config files are not recognized.
Solution:   Use "confini" for aws config files. (Justin M. Keyes,
            closes #11416)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9feccd54ec478f6b608934cf104e83ea22705e68..421d2a36b6af153eb6bd50524d4720a4f976f4b4 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1372,6 +1372,7 @@ au BufNewFile,BufRead pf.conf                             setf pf
 
 " ini style config files, using # comments
 au BufNewFile,BufRead */etc/pacman.conf,mpv.conf       setf confini
+au BufNewFile,BufRead */.aws/config,*/.aws/credentials setf confini
 
 " Pacman hooks
 au BufNewFile,BufRead *.hook

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index c1225a5045ba20818c06bf7afcc6c329567895f1..22e5198f2ddf453da16596ebb55f29d7642c43ff 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -120,7 +120,7 @@ let s:filename_checks = {
     \ 'conaryrecipe': ['file.recipe'],
     \ 'conf': ['auto.master'],
     \ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
-    \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf'],
+    \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials'],
     \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
     \ 'cook': ['file.cook'],
     \ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],

diff --git a/src/version.c b/src/version.c
index 1052fb8191a851efd68987acdaa571a91a561b60..690a1973a74b4c5f9926bd21e2c445bc24449c01 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    814,
 /**/
     813,
 /**/