summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim6
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 5 deletions
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
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 323,
+/**/
322,
/**/
321,