diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-15 14:36:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-15 14:36:07 +0200 |
| commit | 39170e2d9761345df4be67d4d3928ac1094b9adf (patch) | |
| tree | 4a238707ff9569fd1dcab7984a3b1d75444c11f8 | |
| parent | 9f9288627795cb6cc6bff332d28eac86b1dbcf13 (diff) | |
| download | vim-39170e2d9761345df4be67d4d3928ac1094b9adf.zip | |
patch 8.0.0564: cannot detect Bazel BUILD files on some systems
Problem: Cannot detect Bazel BUILD files on some systems.
Solution: Check for BUILD after script checks. (Issue #1340)
| -rw-r--r-- | runtime/filetype.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index fce45d9b6..430fe4533 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2017 Mar 27 +" Last Change: 2017 Apr 15 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -310,9 +310,10 @@ au BufNewFile,BufRead *.bl setf blank au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml " Bazel (http://bazel.io) -autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl +autocmd BufRead,BufNewFile *.bzl,WORKSPACE setf bzl if has("fname_case") - autocmd BufRead,BufNewFile BUILD setfiletype bzl + " There is another check for BUILD further below. + autocmd BufRead,BufNewFile BUILD setf bzl endif " C or lpc @@ -2602,6 +2603,11 @@ au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm') " Bazaar version control au BufNewFile,BufRead bzr_log.* setf bzr +" Bazel build file +if !has("fname_case") + au BufNewFile,BufRead BUILD setf bzl +endif + " BIND zone au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone') diff --git a/src/version.c b/src/version.c index bef2bfd38..048953d38 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 564, +/**/ 563, /**/ 562, |