patch 9.1.0323: filetype: cabal config files may not be recognized

Problem:  filetype: cabal config files may not be recognized
Solution: Change filetype pattern to '*/{,.}cabal/config'
          (Wu Zhenyu)

closes: #14498

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c7e2015a05c42a9a28671998b249766a63e55357..61f17c458df5dc1c078f77df1dc1d5c334a1a491 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -975,11 +975,7 @@ au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot,*.hsig setf haskell
 au BufNewFile,BufRead *.lhs                    setf lhaskell
 au BufNewFile,BufRead *.chs                    setf chaskell
 au BufNewFile,BufRead cabal.project            setf cabalproject
-au BufNewFile,BufRead $HOME/.cabal/config      setf cabalconfig
-if exists('$XDG_CONFIG_HOME')
-  au BufNewFile,BufRead $XDG_CONFIG_HOME/cabal/config setf cabalconfig
-endif
-au BufNewFile,BufRead $HOME/.config/cabal/config setf cabalconfig
+au BufNewFile,BufRead */{.,}cabal/config       setf cabalconfig
 au BufNewFile,BufRead cabal.config             setf cabalconfig
 au BufNewFile,BufRead *.persistentmodels       setf haskellpersistent
 

diff --git a/src/version.c b/src/version.c
index 2d1a6b674dbe53493fd0992ffc4625679c9f7e8b..7411921dfeace49a4e169714fafb70075dd294ff 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    323,
 /**/
     322,
 /**/