Skip to content

Commit 39170e2

Browse files
committed
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)
1 parent 9f92886 commit 39170e2

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

runtime/filetype.vim

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim support file to detect file types
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2017 Mar 27
4+
" Last Change: 2017 Apr 15
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -310,9 +310,10 @@ au BufNewFile,BufRead *.bl setf blank
310310
au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml
311311

312312
" Bazel (http://bazel.io)
313-
autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl
313+
autocmd BufRead,BufNewFile *.bzl,WORKSPACE setf bzl
314314
if has("fname_case")
315-
autocmd BufRead,BufNewFile BUILD setfiletype bzl
315+
" There is another check for BUILD further below.
316+
autocmd BufRead,BufNewFile BUILD setf bzl
316317
endif
317318

318319
" C or lpc
@@ -2602,6 +2603,11 @@ au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
26022603
" Bazaar version control
26032604
au BufNewFile,BufRead bzr_log.* setf bzr
26042605

2606+
" Bazel build file
2607+
if !has("fname_case")
2608+
au BufNewFile,BufRead BUILD setf bzl
2609+
endif
2610+
26052611
" BIND zone
26062612
au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone')
26072613

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
564,
767769
/**/
768770
563,
769771
/**/

0 commit comments

Comments
 (0)