From: Wu, Zhenyu Date: Sun, 14 Apr 2024 18:22:19 +0000 (+0200) Subject: patch 9.1.0323: filetype: cabal config files may not be recognized X-Git-Tag: v9.1.0323^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=799dedec0e959d7a18df8a06d497770706d1627c;p=thirdparty%2Fvim.git 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 Signed-off-by: Christian Brabandt --- diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c7e2015a05..61f17c458d 100644 --- 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 2d1a6b674d..7411921dfe 100644 --- 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, /**/