aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-08-01 10:27:35 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-08-01 10:27:35 +1200
commit4aee2dcb01b5e45e67854d77e908f3d4cfc24bb6 (patch)
treea59e707541b830fd2e5823de60d781c7657cfe24
parentMerge branch 'release/v7.3.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-4aee2dcb01b5e45e67854d77e908f3d4cfc24bb6.tar.gz
dotfiles-4aee2dcb01b5e45e67854d77e908f3d4cfc24bb6.zip
Merge branch 'release/v7.4.0'v7.4.0
* release/v7.4.0: Support .yml extension for Vim ft=yaml
-rw-r--r--VERSION4
-rw-r--r--vim/filetype.vim3
2 files changed, 4 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 6bbcbcef..94e3667e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v7.3.0
-Tue, 30 Jul 2019 22:10:14 +0000
+tejr dotfiles v7.4.0
+Wed, 31 Jul 2019 22:27:33 +0000
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 7852c37e..1f1686e1 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -443,7 +443,8 @@ augroup filetypedetect
\ setfiletype yacc
" YAML files
autocmd BufNewFile,BufRead
- \ ?*.yaml
+ \ ?*.yml
+ \,?*.yaml
\ setfiletype yaml
" Z shell files
autocmd BufNewFile,BufRead