thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0564: cannot detect Bazel BUILD files on some systems

Browse Source 
Problem:    Cannot detect Bazel BUILD files on some systems.
Solution:   Check for BUILD after script checks. (Issue #1340)
This commit is contained in:
Bram Moolenaar
2017-04-15 14:36:07 +02:00
parent 9f92886277
commit 39170e2d97
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/filetype.vim
View File

@@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " 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 " Listen very carefully, I will say this only once
if exists("did_load_filetypes") 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 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml
" Bazel (http://bazel.io) " Bazel (http://bazel.io)
autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl autocmd BufRead,BufNewFile *.bzl,WORKSPACE setf bzl
if has("fname_case") 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 endif
" C or lpc " C or lpc
@@ -2602,6 +2603,11 @@ au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
" Bazaar version control " Bazaar version control
au BufNewFile,BufRead bzr_log.* setf bzr au BufNewFile,BufRead bzr_log.* setf bzr
" Bazel build file
if !has("fname_case")
au BufNewFile,BufRead BUILD setf bzl
endif
" BIND zone " BIND zone
au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone') au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone')

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
564,
/**/ /**/
563, 563,
/**/ /**/