diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-04-18 04:09:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 04:09:32 +0200 |
| commit | e5da4fd557a266ec5931be90c83fd600167ac588 (patch) | |
| tree | 732c8e500c50f59979de90aa30bae7b2f5b3dcc7 | |
| parent | fb4c7a53cfe4d4c8a786c8a5dc3c4b999c2df815 (diff) | |
| parent | b3d669b40bd4736d42c52430ec84d76c2f5151eb (diff) | |
| download | rneovim-e5da4fd557a266ec5931be90c83fd600167ac588.tar.gz rneovim-e5da4fd557a266ec5931be90c83fd600167ac588.tar.bz2 rneovim-e5da4fd557a266ec5931be90c83fd600167ac588.zip | |
Merge pull request #12145 from janlazo/vim-8.2.0584
vim-patch:8.2.{584,589}
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/nvim/ex_session.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index dbdd90041c..5068f9be76 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -230,13 +230,13 @@ au BufNewFile,BufRead *.bl setf blank au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml " BSDL -au BufNewFile,BufRead *.bsdl setf bsdl +au BufNewFile,BufRead *bsd,*.bsdl setf bsdl " Bazel (http://bazel.io) autocmd BufRead,BufNewFile *.bzl,WORKSPACE,BUILD.bazel setf bzl if has("fname_case") " There is another check for BUILD further below. - autocmd BufRead,BufNewFile BUILD setf bzl + autocmd BufRead,BufNewFile BUILD setf bzl endif " C or lpc diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c index b8f2927480..1b797c6168 100644 --- a/src/nvim/ex_session.c +++ b/src/nvim/ex_session.c @@ -799,7 +799,7 @@ static int makeopens(FILE *fd, char_u *dirnow) // if (fprintf(fd, "%s", "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"\n" - "if file_readable(s:sx)\n" + "if filereadable(s:sx)\n" " exe \"source \" . fnameescape(s:sx)\n" "endif\n") < 0) { return FAIL; diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index e4e48d2d35..c3ddce7914 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -79,7 +79,7 @@ let s:filename_checks = { \ 'bib': ['file.bib'], \ 'bindzone': ['named.root'], \ 'blank': ['file.bl'], - \ 'bsdl': ['file.bsdl'], + \ 'bsdl': ['file.bsd', 'file.bsdl'], \ 'bst': ['file.bst'], \ 'bzr': ['bzr_log.any'], \ 'c': ['enlightenment/file.cfg', 'file.qc', 'file.c'], |